diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 0d29f985c..f822ecc61 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -6,5 +6,7 @@ AUX nmap-5.51-su-to-zenmap-fix.patch 785 RMD160 44f30cdf13120d949792eb07e82d7b69
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
 DIST nmap-5.61TEST4.tar.bz2 21757047 RMD160 549cf6cf1a3f1f4cce32fe3f93c2eb7e616c7524 SHA1 a7c78fcda2168e8f58737ffc1bfc8dfe4eb378bf SHA256 b914d42dd578ffd711e6e5a8ea136acbe367c356c03c967811e76bd24a1923ae
 DIST nmap-5.61TEST5.tar.bz2 21500913 RMD160 765cac0af9e3a82ee40b634960aac7e270f92f76 SHA1 b3452eb82bb4e9754c49b1ff853d3abe79f1047a SHA256 048fb618dd02e9003280a10a7fe0584b70f47a4220583ad575c8acee31a0a465
+DIST nmap-6.00.tar.bz2 21639906 RMD160 e8f9c1da433aadcbc18ab216445466388c0e331a SHA1 11d8f418e31a85e5b5ad6b4cf98f3c1b5c19ddb2 SHA256 9037b49ffde13a228ce4ffadd3de8320580f84a0cd8ac14b2fd74757f1fb4b26
 EBUILD nmap-5.61_beta4.ebuild 1902 RMD160 fd01c54c76b3760207479dc068d175dd4b9f82d5 SHA1 9c0d17142a39b5e0bc449146a63774ff2e21609a SHA256 66629b95c6b844a4dc8f3202c0bde5b8e013fcfb28caa91577a906c0cee09535
 EBUILD nmap-5.61_beta5.ebuild 1902 RMD160 fd01c54c76b3760207479dc068d175dd4b9f82d5 SHA1 9c0d17142a39b5e0bc449146a63774ff2e21609a SHA256 66629b95c6b844a4dc8f3202c0bde5b8e013fcfb28caa91577a906c0cee09535
+EBUILD nmap-6.00.ebuild 1902 RMD160 fd01c54c76b3760207479dc068d175dd4b9f82d5 SHA1 9c0d17142a39b5e0bc449146a63774ff2e21609a SHA256 66629b95c6b844a4dc8f3202c0bde5b8e013fcfb28caa91577a906c0cee09535
diff --git a/net-analyzer/nmap/nmap-6.00.ebuild b/net-analyzer/nmap/nmap-6.00.ebuild
new file mode 100644
index 000000000..a71d217f8
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.00.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.51.ebuild,v 1.10 2011/06/12 22:14:04 spock Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils flag-o-matic python
+
+MY_P=${P/_beta/TEST}
+
+DESCRIPTION="A utility for network exploration or security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="http://nmap.org/dist/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="gtk ipv6 lua ssl"
+
+DEPEND="dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	gtk? ( >=x11-libs/gtk+-2.6:2
+		   >=dev-python/pygtk-2.6
+		   || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 )
+		 )
+	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.75-include.patch
+	epatch "${FILESDIR}"/${PN}-4.75-nolua.patch
+	epatch "${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	epatch "${FILESDIR}"/${PN}-5.21-python.patch
+	epatch "${FILESDIR}"/${PN}-5.51-su-to-zenmap-fix.patch
+	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf --with-libdnet=included \
+		--without-nmap-update \
+		$(use_with gtk zenmap) \
+		$(use_with lua liblua) \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir="${EPREFIX}"/usr/share/nmap install || die
+	dodoc CHANGELOG HACKING docs/README docs/*.txt || die
+
+	use gtk && doicon "${FILESDIR}/nmap-logo-64.png"
+}