diff --git a/net-analyzer/medusa/Manifest b/net-analyzer/medusa/Manifest
index f4139352a..1729eb340 100644
--- a/net-analyzer/medusa/Manifest
+++ b/net-analyzer/medusa/Manifest
@@ -1,4 +1,6 @@
 AUX medusa-as-needed.patch 1055 RMD160 71a01f9127a3d8024c4880e48b3dfa874a5d3590 SHA1 f1e8c7f1be2ea0c3a10d7607c83bee045a52ccba SHA256 36b5fd3895c0eb9e7b6b0820e44b036ec235d2e1eda2a1980ed139992eafbacc
 AUX medusa-sha1_qa_include.patch 261 RMD160 ae33b0aa5456179e5fe2a1eacec2bf9d89b12818 SHA1 5222e2e85aff0ad6b72d942b77c77b0651118812 SHA256 79b5c87ddd7929f3ed69477cea7fcb836acec70063984df3359aa0612115b31c
 DIST medusa-2.0.tar.gz 371478 RMD160 28e27525d704621c1d897c368a58080dac12be45 SHA1 bdea5e5c81d588af35e564a54d9eb2b77eb92371 SHA256 ba7d1ded937f976bbd7448c59e628698657ea06e4869243066cae503fa8142cd
+DIST medusa-2.1.tar.gz 383741 RMD160 5e7ed4df3dc695a490516e40b243a060b86a3af0 SHA1 fb91534aabc396fc6a975a84086c59046e2d4f5d SHA256 c025913f2adb46f6363403f1dba37a03155fefe338866e5ce249f765ce90617e
 EBUILD medusa-2.0-r1.ebuild 1276 RMD160 97b0a9f3adce456b770242dba04f61c13e7647b0 SHA1 5efe63fecfa443e8d3fae49d68a7075ff1f6d478 SHA256 b25e9fd83ed32ce8ddb2c152440fb23419bcb36cca3af4e01785370edeaae303
+EBUILD medusa-2.1.ebuild 1078 RMD160 6d2cceed2ff234dc093b9107a21c3e589cf56f3a SHA1 db8959180b52f434a02329ac1774858b07d269be SHA256 85b19efb06b226d80f90410ce2f6e2118b8ede6516acce7d5b11a758e881bce4
diff --git a/net-analyzer/medusa/medusa-2.1.ebuild b/net-analyzer/medusa/medusa-2.1.ebuild
new file mode 100644
index 000000000..dbaea2610
--- /dev/null
+++ b/net-analyzer/medusa/medusa-2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="A Modular,Parallel,Multiprotocol, Network Login Auditor"
+HOMEPAGE="http://www.foofus.net/jmk/medusa/medusa.html"
+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 afp"
+
+RDEPEND="ssh2? ( net-libs/libssh2 )
+	ncp? ( net-fs/ncpfs )
+	postgres? ( dev-db/postgresql-base:8.4 )
+	subversion? ( dev-vcs/subversion )
+	dev-libs/openssl
+	afp? ( net-fs/afpfs-ng )"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake"
+
+src_configure() {
+	econf \
+		--with-default-mod-path="/usr/lib/medusa/modules" \
+		`use_enable debug` \
+		`use_enable ssh2 module-ssh` \
+		`use_enable ncp module-ncp` \
+		`use_enable postgres module-postgres` \
+		`use_enable subversion module-svn` \
+		`use_enable afp module-afp` \
+		|| die "econf failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed!"
+	dodoc README TODO ChangeLog
+	dohtml doc/*.html
+}