diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index a320933bd..707615125 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,3 +1,3 @@
 AUX msfrpcd3.confd 440 RMD160 67e569204d77592e8b0e19d34d87c0c75a722687 SHA1 ff1eea41295270d0b5117ee233b5f5fe44a84834 SHA256 f1148f3f4fe24b2689d6a8f3d8510031f493100a5b48823c0a5bc2085a6439b4
 AUX msfrpcd3.initd 561 RMD160 e9811489784131c4c1e68279d43b4f2ba4c093b1 SHA1 38240c3bba090011c25fffe90d9c898e540ba463 SHA256 89a897977b53a471334caa47eeadcb5595fa783bfafd99c7ae1d5c8f9e7041bc
-EBUILD metasploit-9999.ebuild 4170 RMD160 3ef8366a94ecb0d3b6a4fe2e0b00b4c0d726a4a5 SHA1 73e3e139c0067da660a643a91b3920a1fa3dfbb5 SHA256 6a6d521c50320d281fcd813c695a932794725f2e90ef867c1a7422b1ad608654
+EBUILD metasploit-9999.ebuild 4294 RMD160 285782e0ca976f4891cf524bf215a7e2e059a47e SHA1 a2ce6558cc6d3e8f73653e4751c51f296b9e8530 SHA256 e50420179954f6f8c982fbac3e23e5aa46690d50f1efb5913981aa6922e1e421
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 8504ff7da..75415f016 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1998-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1_p5699-r1.ebuild,v 1.3 2008/11/09 14:52:13 nixnut Exp $
 
@@ -18,12 +18,10 @@ ESVN_REPO_URI="https://metasploit.com/svn/framework3/trunk/"
 DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 
-LICENSE="MSF-1.2"
+LICENSE="BSD"
 SLOT="3"
 KEYWORDS="amd64 arm ppc ~sparc x86"
-IUSE="armitage sqlite postgres"
-
-#REQUIRED_USE="armitage? ( || ( sqlite postgres ) )"
+IUSE="armitage mysql postgres sqlite"
 
 # blocker on ruby-1.8.7:
 # http://spool.metasploit.com/pipermail/framework/2008-September/003671.html
@@ -32,14 +30,14 @@ RDEPEND="dev-lang/ruby
 	virtual/jdk
 	dev-ruby/rjb
 	dev-ruby/hpricot
+	mysql? ( dev-ruby/mysql-ruby
+		dev-ruby/activerecord )
 	sqlite? ( dev-ruby/sqlite3-ruby
-		dev-ruby/activerecord 
-		armitage? ( net-analyzer/nmap ) )
+		dev-ruby/activerecord )
 	postgres? ( dev-ruby/pg
-		dev-ruby/activerecord 
-		armitage? ( net-analyzer/nmap ) )
-	armitage? ( !net-analyzer/armitage )"
-#	 dev-ruby/ruby-postgres
+		dev-ruby/activerecord )
+	armitage? ( net-analyzer/nmap 
+		!net-analyzer/armitage )"
 DEPEND=""
 
 QA_PRESTRIPPED="
@@ -80,11 +78,16 @@ src_install() {
 	newconfd "${FILESDIR}"/msfrpcd${SLOT}.confd msfrpcd${SLOT} \
 		|| die "newconfd failed"
 
-	if use postgres || use sqlite; then
-		if use armitage; then
+	if use armitage; then
+		if use mysql || use postgres || use sqlite; then
 	#		dodoc *.txt
 			echo -e "#!/bin/sh \n\njava -Xmx256m -jar /usr/lib/${PN}${SLOT}/data/armitage/armitage.jar \$*\n" > armitage
 			dobin armitage
+		else
+			eerror "Armitage requires a database back end to run, please select one"
+			eerror "of the following:"
+			eerror "MySQL, PostgreSQL or SQLite (Not supported by Metasploit team anymore)."
+			die "No database back end selected."
 		fi
 	fi
 }