diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index f5e9e63fa26a..cb87b6e9e404 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	nmap
 PORTVERSION=	3.48
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://download.insecure.org/nmap/dist/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/nmap/
diff --git a/security/nmap/files/patch-nbase::configure b/security/nmap/files/patch-nbase::configure
index c6b8cc5ac31e..d28009eefd07 100644
--- a/security/nmap/files/patch-nbase::configure
+++ b/security/nmap/files/patch-nbase::configure
@@ -9,3 +9,12 @@
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -5908,7 +5908,7 @@
+     ;;
+   *)
+     specialssldir="$with_openssl"
+-    CXXFLAGS="-I$with_openssl/include $CXXFLAGS"
++    CFLAGS="-I$with_openssl/include $CFLAGS"
+     ;;
+   esac
+
diff --git a/security/nmap/files/patch-nsock::src::configure b/security/nmap/files/patch-nsock::src::configure
new file mode 100644
index 000000000000..4b7f94b9b870
--- /dev/null
+++ b/security/nmap/files/patch-nsock::src::configure
@@ -0,0 +1,19 @@
+--- nsock/src/configure.orig   Tue Oct  7 07:23:06 2003
++++ nsock/src/configure        Tue Oct  7 07:27:33 2003
+@@ -1287,7 +1287,6 @@
+      fi
+    if test -d /usr/local/include; then
+      CFLAGS="$CFLAGS -I/usr/local/include"
+-     CXXFLAGS="$CFLAGS -I/usr/local/include"
+    fi
+ fi
+
+@@ -3207,7 +3206,7 @@
+     ;;
+   *)
+     specialssldir="$with_openssl"
+-    CXXFLAGS="-I$with_openssl/include $CXXFLAGS"
++    CFLAGS="-I$with_openssl/include $CFLAGS"
+     ;;
+   esac
+