diff --git a/net-analyzer/medusa/Manifest b/net-analyzer/medusa/Manifest
index 70794aa21..566d96fa3 100644
--- a/net-analyzer/medusa/Manifest
+++ b/net-analyzer/medusa/Manifest
@@ -1,2 +1 @@
-DIST medusa-2.1.1.tar.gz 383424 SHA256 c8f83f54f76f021f213007c1c83e659f30dd16de84046df2b50e3db2bb6a7ef2 SHA512 e8ea4a532e1af6dff9c0bcbf761df94b4e9b6f30da50fe2dec7f3402d70a1fdf5297fad84d12b5125f3edbbf350ca439993f60dabecaa46630615d271275b8e9 WHIRLPOOL a874d8b96352c026e170c95bc395d16b47c1198a5da7cce0085581ba96629df86bcfdde7f72f60af2990e333fd4206b783f02532f961b8e922463ab9bfd61868
 DIST medusa-2.2.tar.gz 407412 SHA256 b4c07f4d8d6e1e4b2c60d91e429ffe20d52afa80fea8c401ac548967d1fe194a SHA512 7f79f0ec95d55b04ba3b3cd94a3eaccef87b5ff6cf7ae653d970e968f60b5fb27647a98a34075ee565cf5bc067c60a6883b890729a10af247f3a5e10d7dd0d2a WHIRLPOOL 1423a28441cec38d5ff9e4def59a5599b3b2c1f2fbcb2b7cad40e4d68255f409613b241a972c1c377819e0eb483158417b025beeb8d17a6385b35fb2b88f6aea
diff --git a/net-analyzer/medusa/files/medusa-as-needed.patch b/net-analyzer/medusa/files/medusa-as-needed.patch
deleted file mode 100644
index 8c6b9bf4b..000000000
--- a/net-analyzer/medusa/files/medusa-as-needed.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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/files/medusa-sha1_qa_include.patch b/net-analyzer/medusa/files/medusa-sha1_qa_include.patch
deleted file mode 100644
index f51cdc5d5..000000000
--- a/net-analyzer/medusa/files/medusa-sha1_qa_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/modsrc/sha1.h.orig	2011-12-05 08:37:54.290667007 +0800
-+++ src/modsrc/sha1.h	2011-12-05 08:38:15.335666987 +0800
-@@ -28,6 +28,7 @@
-  Modified 2002 by Peter Zaitsev to better follow MySQL standards
- */
- 
-+#include <strings.h>
- 
- enum sha_result_codes
- {
diff --git a/net-analyzer/medusa/medusa-2.1.1.ebuild b/net-analyzer/medusa/medusa-2.1.1.ebuild
deleted file mode 100644
index 8b77a77f2..000000000
--- a/net-analyzer/medusa/medusa-2.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 )
-	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
-}
diff --git a/net-analyzer/medusa/medusa-2.2.ebuild b/net-analyzer/medusa/medusa-2.2-r1.ebuild
similarity index 76%
rename from net-analyzer/medusa/medusa-2.2.ebuild
rename to net-analyzer/medusa/medusa-2.2-r1.ebuild
index 36b6bc460..f439baef1 100644
--- a/net-analyzer/medusa/medusa-2.2.ebuild
+++ b/net-analyzer/medusa/medusa-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 DESCRIPTION="A Modular,Parallel,Multiprotocol, Network Login Auditor"
 HOMEPAGE="http://www.foofus.net/jmk/medusa/medusa.html"
-SRC_URI="https://github.com/jmk-foofus/medusa/archive/${PVR}.tar.gz -> ${PF}.tar.gz"
+SRC_URI="https://github.com/jmk-foofus/medusa/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,12 +33,11 @@ src_configure() {
 		`use_enable postgres module-postgres` \
 		`use_enable rdp module-rdp` \
 		`use_enable ssh2 module-ssh` \
-		`use_enable subversion module-svn` \
-		|| die "econf failed"
+		`use_enable subversion module-svn`
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Install failed!"
-	dodoc README TODO ChangeLog
+	emake DESTDIR="${D}" install
+	dodoc README.md TODO ChangeLog
 	dohtml doc/*.html
 }