diff --git a/app-backup/amanda/amanda-3.5.ebuild b/app-backup/amanda/amanda-3.5.ebuild
index 797dbc7a02652..f59aebd6c0483 100644
--- a/app-backup/amanda/amanda-3.5.ebuild
+++ b/app-backup/amanda/amanda-3.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
 
 LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 RDEPEND="sys-libs/readline:=
@@ -288,6 +288,9 @@ src_configure() {
 	# build manpages
 	myconf="${myconf} --enable-manpage-build"
 
+	# Bug #636262
+	myconf="${myconf} $(use_with ndmp ndmp)"
+
 	# bug #483120
 	tc-export AR
 
diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index e191fc902dcf4..a044ded276329 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -23,6 +23,7 @@
 	<use>
 		<flag name="xfs">Support for backing up raw XFS filesystems using xfsdump</flag>
 		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
+		<flag name="ndmp">Support for the NDMP protocol</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">amanda</remote-id>