diff --git a/net-analyzer/medusa/Manifest b/net-analyzer/medusa/Manifest
index 948c18551..6a17a5389 100644
--- a/net-analyzer/medusa/Manifest
+++ b/net-analyzer/medusa/Manifest
@@ -2,4 +2,4 @@ AUX medusa-as-needed.patch 1055 RMD160 71a01f9127a3d8024c4880e48b3dfa874a5d3590
 DIST medusa-1.5.tar.gz 346795 RMD160 f926db9ce2cca7cf4fb83b937e4d4fbd0da5f9c2 SHA1 8c9251e929303bc462f41b8a4ecded3bf19868d4 SHA256 61ae6b45b3405522e4bf0e3aeb7be51f6bcf3f1452015b890bc4a305e144a259
 DIST medusa-2.0.tar.gz 371478 RMD160 28e27525d704621c1d897c368a58080dac12be45 SHA1 bdea5e5c81d588af35e564a54d9eb2b77eb92371 SHA256 ba7d1ded937f976bbd7448c59e628698657ea06e4869243066cae503fa8142cd
 EBUILD medusa-1.5-r1.ebuild 1062 RMD160 34965adbb324a07366a57ca256716842bd2e775b SHA1 4b0b6edda1ea0518fa47773b78826217def24750 SHA256 d0f2b558b65036f0d4c5ff1cf18a3c3a4f14b2aec217459dce595cb5d6c4afb5
-EBUILD medusa-2.0.ebuild 1157 RMD160 82240bd20a89033b56ec170e2d3e56095608b0ba SHA1 b038d1731d78b97b2cb1a4e36f12233da4f8cbb9 SHA256 38ac56cf21c1d6dce17cd424c97d22bbdc9183a14adecc54baf4c18605520267
+EBUILD medusa-2.0.ebuild 1207 RMD160 82833fe22bf8b2ab2a2e4ba36e27e040fa447c87 SHA1 254e79df57b7d75e486bb7468be2866802f004fc SHA256 c81db9dc82bf93620af731d7e9afe230da39cfed79d75406da5418a09e13b7cb
diff --git a/net-analyzer/medusa/medusa-2.0.ebuild b/net-analyzer/medusa/medusa-2.0.ebuild
index bc481e337..cf14cef39 100644
--- a/net-analyzer/medusa/medusa-2.0.ebuild
+++ b/net-analyzer/medusa/medusa-2.0.ebuild
@@ -13,14 +13,15 @@ SRC_URI="http://www.foofus.net/jmk/tools/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug ncp postgres +ssh2 subversion +untested-modules"
+IUSE="debug ncp postgres +ssh2 subversion afp"
 
 RDEPEND="ssh2? ( net-libs/libssh2 )
 	ncp? ( net-fs/ncpfs )
 	postgres? ( dev-db/libpq )
-	subversion? ( dev-util/subversion )"
-DEPEND="${RDEPEND}
+	subversion? ( dev-util/subversion )
 	dev-libs/openssl
+	afp? ( net-fs/afpfs-ng )"
+DEPEND="${RDEPEND}
 	sys-devel/autoconf
 	sys-devel/automake"
 
@@ -34,9 +35,10 @@ src_configure() {
 		--with-default-mod-path="/usr/lib/medusa/modules" \
 		`use_enable debug` \
 		`use_enable ssh2 module-ssh` \
-		`use_with ncp module-ncp` \
-		`use_with postgres module-postgres` \
-		`use_with subversion module-svn` \
+		`use_enable ncp module-ncp` \
+		`use_enable postgres module-postgres` \
+		`use_enable subversion module-svn` \
+		`use_enable afp module-afp` \
 		|| die "econf failed"
 }