diff --git a/net-analyzer/medusa/Manifest b/net-analyzer/medusa/Manifest
index 55580d4ad..948c18551 100644
--- a/net-analyzer/medusa/Manifest
+++ b/net-analyzer/medusa/Manifest
@@ -1,2 +1,5 @@
+AUX medusa-as-needed.patch 1055 RMD160 71a01f9127a3d8024c4880e48b3dfa874a5d3590 SHA1 f1e8c7f1be2ea0c3a10d7607c83bee045a52ccba SHA256 36b5fd3895c0eb9e7b6b0820e44b036ec235d2e1eda2a1980ed139992eafbacc
 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
diff --git a/net-analyzer/medusa/files/medusa-as-needed.patch b/net-analyzer/medusa/files/medusa-as-needed.patch
new file mode 100644
index 000000000..8c6b9bf4b
--- /dev/null
+++ b/net-analyzer/medusa/files/medusa-as-needed.patch
@@ -0,0 +1,23 @@
+--- configure.in.old	2010-02-09 23:17:51.000000000 +0100
++++ configure.in	2010-02-25 12:42:56.484682369 +0100
+@@ -101,7 +101,7 @@
+ AC_CHECK_LIB(crypto, CRYPTO_lock, [], [AC_MSG_WARN([ *** LibCrypto may be required for *BSD ***])])
+ AC_CHECK_HEADER([openssl/ssl.h], 
+   [AC_CHECK_LIB(ssl, main,
+-    [AC_DEFINE(HAVE_LIBSSL, 1, [Found OpenSSL Library]) LDFLAGS="$LDFLAGS -lssl -lcrypto" check_libssl="true"],
++    [AC_DEFINE(HAVE_LIBSSL, 1, [Found OpenSSL Library]) LIBS="$LIBS -lssl -lcrypto" check_libssl="true"],
+     [AC_MSG_WARN([ *** OpenSSL library required for SSL support. ***
+ 
+       Many of the Medusa modules depend on the OpenSSL library and header files. If
+--- configure.in.old	2010-02-25 12:46:43.156690552 +0100
++++ configure.in	2010-02-25 12:47:31.979711517 +0100
+@@ -868,7 +868,8 @@
+ esac
+ 
+ AC_SUBST([MODULE_LDFLAGS])
+-LDFLAGS="$LDFLAGS $RDYNAMIC $LIBDL $EXTRA_LIBS"
++LDFLAGS="$LDFLAGS $RDYNAMIC $EXTRA_LIBS"
++LIBS="$LIBS $LIBDL"
+ 
+ test "$prefix" = NONE && prefix=${ac_default_prefix}
+ _default_mod_path="${prefix}/lib/medusa/modules"
diff --git a/net-analyzer/medusa/medusa-2.0.ebuild b/net-analyzer/medusa/medusa-2.0.ebuild
new file mode 100644
index 000000000..bc481e337
--- /dev/null
+++ b/net-analyzer/medusa/medusa-2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+EAPI="2"
+
+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 +untested-modules"
+
+RDEPEND="ssh2? ( net-libs/libssh2 )
+	ncp? ( net-fs/ncpfs )
+	postgres? ( dev-db/libpq )
+	subversion? ( dev-util/subversion )"
+DEPEND="${RDEPEND}
+	dev-libs/openssl
+	sys-devel/autoconf
+	sys-devel/automake"
+
+src_prepare() {
+	epatch "${FILESDIR}"/$PN-as-needed.patch
+}
+
+src_configure() {
+	local myconf
+	econf \
+		--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` \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed!"
+
+	dodoc README TODO ChangeLog
+	dohtml doc/*.html
+}