diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 432b46b90..f238a6c81 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -7,9 +7,10 @@ AUX nmap-5.21-openssl-1.patch 920 SHA256 1e0167303acdeb01a90d61afd2cc8ca521d8e95
 AUX nmap-5.21-python.patch 1219 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b830c6346d71cdc2357a16b74 SHA512 d670b382d183a55d0a744d4055aafffdaf64b071ae169e94e7d627ca8b74df38d02ef7858b0976b7079828c14705d0f1998a9640445f3cd4f5f4d4c5b2ce0bf3 WHIRLPOOL 1d84ccf26fb0affff5a05f6fd00ea5aff1bbb3a9d3320e7a90a9feeba68aa7fa38e8be527eea93824616003a61321f21fa8fb5ce662e4b43ef8581679f40bd3a
 AUX nmap-5.51-su-to-zenmap-fix.patch 785 SHA256 f57d70bd98b0b395661dc2b85df15ae79b71fe339133967f7af4eee98feee8da SHA512 44482306e7346fa7896a4c900d06431ebadf0e32ca5b9abd3e3f32e06f20e11809c0bdaa62fa3807431b4dfab7c6ddf422dc05a5a96e9e3f9217f2c64285bce4 WHIRLPOOL 516bf0d76e8633605c106ff6982f089df1e4c9d696e11bb589000fed8355b5a504694c286a03bd9845508aa833c11d3fa1ae61c961e72b87a0329d6aabd37126
 AUX nmap-6.01-make.patch 571 SHA256 d315795797c60712b00dbdc0e1fe5df6851575e0dbc11abb772a51c739ab60cb SHA512 47752ac65a07aef68eb075b72a0e9062612a2df08135d3f4284805f8fdc394a1fa3b937c1df018f7cce58f4c96db57af17e720250b6f67ce80f8cbb35eb82deb WHIRLPOOL b9ec86290bb1a681ee16aeaeb336ca7def8689d0ae311bc223591eefbade0db6b5f58ebf86d52406b24d8c656f51e06d049a4c3893a730aafe5448a7f5765e42
+AUX nmap-6.25-nolua.patch 1980 SHA256 fd4ad9287af4b52a2ddbe4b800d27185bb32b51c58a12f77b8c4391e9dc9ecec SHA512 cebe5bc85bea2870bfb151dc1252c9f4d9e7269107e92d17eb8d89b06dcbac71ef29cf8b0ed1d732dd2d01c6130d3e84b02016ddf149e48eda1ab322f1fe62fe WHIRLPOOL 3b615a01d91220008ee74648c92fd4fd8159ad69284b05b1b33656b28fbea4fc44d6d789024fca90ac6e4410741726f656f25aa96e3dec61b7f8bcad72234cea
 AUX nmap-6.25-su-to-zenmap.patch 667 SHA256 f59f82368f633e7de1cc3a546d513d18ad5210595e93c8b5da1b482bece5ecc6 SHA512 bd6446f9834f6d918aa39efdfe779f36465f0a39f6079587dba39bc429f1a42810e46dab776cf9207d6bd5ba15456db08a965c3f0e036d2c7ece3485a6c7431a WHIRLPOOL c070b47e3ab6d08aa0f5c115a5cbe56b6d1349694b549c56fafcf62436da0651ff22f64d725d0aa931ecb723df338d885158615fd34a05d5f7d5e98908a12af0
 AUX nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 AUX su-to-zenmap.sh.diff 407 SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36 SHA512 bbab3e83d7c8365915ec948bb18b897afabbe574ed5c42ffecc528392cde5af7bc1f0a63b0b56af3616c6631e6402eda3526785221d43a02df22bfe15e63c73a WHIRLPOOL 2148ac5dd7e63ed218d2ab2d93d53da8ee605861029e83b66860ac18a39d1b5f5c1365d16c7d5533b1a6a5839e0d74bde07ba2d907bff413314714383d0ee92f
 DIST nmap-6.25.tar.bz2 7668639 SHA256 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 SHA512 6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d WHIRLPOOL b6cd57988827549762020e73ff263f5014d6c748291225d8c9792705da39188436004400b05a07414b4cc4b9ea56c75ebf7c753bbe11a5456b008041e72ebbc4
-EBUILD nmap-6.25.ebuild 2601 SHA256 584a90eb17aa33e98b2ff7b18d3d8609a847dd638d6f219b8a1a0aa5448e0f91 SHA512 ecff42ef17b2708c890f68b821b02fb4ed8ad79b9e902a46b4b6281778f98024fbdf7d5f91fa916b253a56f188152f2ea56eef691ca368bf6578867ebafa2e3f WHIRLPOOL ebf5c50ab42af964c5f9a7e64421e1cdcbcd716be61cd8b224bb0876457eb3fe7f2c370c272fc96dadca035294d78db60087470f5c0cbd61909d996f60b92fcb
+EBUILD nmap-6.25.ebuild 2602 SHA256 f8766614926266181d140ff0833fa1655624b4bbaff1d7c61fe3c2e0b77a4f80 SHA512 acc77112072879aa6198b4ccf3ba35dbc118dac965e827033dffb6da605bad1bea36aaa8902ca3ef7e60b415f3ffedc753c3efaff05d016fa5ff00e7cce6173f WHIRLPOOL 8aa7939dbc9a4c1fcbd0546d684b50886ea20cbd09e124fdbd927dae478504e228b38c93413ea7354ee4939423af1bbdf8dc170201850907204d3ec4b7bc9160
 EBUILD nmap-9999.ebuild 2553 SHA256 8f59c7b7457e03204a4cc6f06d40eddde7bfcc969b77e8d15521da93a0323d4b SHA512 c344fa405c9bba8117db0b008dfa0021ce6b734fa463d180a5f9245d9410af27e4254f1aa9be35f2479b76228cafd5295efe997c51685fc27562b15c65177fd6 WHIRLPOOL ddad83b78e188e321dc269a98d54d787e8a70dd87444978812010a647a71885f8a2e8e451ef902b70b62c1d1b0acc0c8f321f5020b7cfda136ac499f8008d245
diff --git a/net-analyzer/nmap/files/nmap-6.25-nolua.patch b/net-analyzer/nmap/files/nmap-6.25-nolua.patch
new file mode 100644
index 000000000..01a461db5
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.25-nolua.patch
@@ -0,0 +1,72 @@
+--- nmap-6.25/output.h	2012-08-15 00:36:25.000000000 +0800
++++ nmap-6.25-fixed/output.h	2012-12-02 10:30:45.003319377 +0800
+@@ -226,6 +226,10 @@
+ void printscriptresults(ScriptResults *scriptResults, stype scantype);
+ 
+ void printhostscriptresults(Target *currenths);
++
++/*This is a helper function to determine the ordering of the script results
++  based on their id */
++bool comparescriptids(ScriptResult first, ScriptResult second);
+ #endif
+ 
+ /* Print a table with traceroute hops. */
+@@ -253,8 +257,4 @@
+    were found. */
+ void printdatafilepaths();
+ 
+-/*This is a helper function to determine the ordering of the script results
+-  based on their id */
+-bool comparescriptids(ScriptResult first, ScriptResult second);
+-
+ #endif /* OUTPUT_H */
+--- nmap-6.25.orig/output.cc	2012-11-29 11:19:52.000000000 +0800
++++ nmap-6.25/output.cc	2012-12-02 10:44:50.986325233 +0800
+@@ -2613,6 +2613,7 @@
+   }
+ }
+ 
++#ifndef NOLUA
+ /*This is a helper function to determine the ordering of the script results
+   based on their id */
+ bool comparescriptids(ScriptResult first, ScriptResult second){
+@@ -2625,5 +2626,6 @@
+     else
+         return false;
+ }
++#endif
+ 
+ 
+--- nmap-6.25.orig/portlist.cc	2012-10-11 12:45:50.000000000 +0800
++++ nmap-6.25/portlist.cc	2012-12-02 10:51:28.930327962 +0800
+@@ -144,6 +144,7 @@
+   }
+ }
+ 
++#ifndef NOLUA
+ void Port::freeScriptResults(void)
+ {
+     while (!scriptResults.empty()) {
+@@ -151,6 +152,7 @@
+         scriptResults.pop_front();
+     }
+ }
++#endif
+ 
+ /* Fills in namebuf (as long as there is space in buflen) with the
+    Name nmap normal output will use to describe the port.  This takes
+--- nmap-6.25.orig/Target.cc	2012-08-15 00:36:25.000000000 +0800
++++ nmap-6.25/Target.cc	2012-12-02 10:55:28.097329636 +0800
+@@ -162,10 +162,12 @@
+ 
+ Target::~Target() {
+   FreeInternal();
++#ifndef NOLUA
+   while (!scriptResults.empty()) {
+     scriptResults.front().clear();
+     scriptResults.pop_front();
+   }
++#endif
+ }
+ 
+ void Target::FreeInternal() {
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
index d93b0c4b5..b2b6ca91a 100644
--- a/net-analyzer/nmap/nmap-6.25.ebuild
+++ b/net-analyzer/nmap/nmap-6.25.ebuild
@@ -40,8 +40,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.75-include.patch
-	epatch "${FILESDIR}"/${PN}-4.75-nolua.patch
+#	epatch "${FILESDIR}"/${PN}-4.75-include.patch
+	epatch "${FILESDIR}"/${PN}-6.25-nolua.patch
 	epatch "${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	epatch "${FILESDIR}"/${PN}-5.21-python.patch
 	epatch "${FILESDIR}"/${PN}-6.01-make.patch