diff --git a/CHANGELOG b/CHANGELOG
index 9b5fe9ed5..b4757b6b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+Nmap 7.991 [2026-07-31]
+
 o Fixed a memory-consumption hang in Ncat's HTTP proxy code that affected both
   connect and listen modes, reported by kumama_nui.
 
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index b6d07ff51..61e29e5cb 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 7.99SVN ( https://nmap.org )
+Nmap 7.991 ( https://nmap.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
diff --git a/macosx/Makefile b/macosx/Makefile
index 8c0fb6221..eeb0fdb84 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -100,13 +100,13 @@ check-zenmap: stage-zenmap
 export-%:
 	rm -rf $*
 # Using @BASE discards local changes.
-	svn export .. $*
+	git -C .. archive | tar -x -C $*
 
 NMAP_SOURCEDIR=$(JHBUILD_SOURCE)/nmap-$(NMAP_VERSION)
 NMAP_TARBALL=$(JHBUILD_SOURCE)/pkgs/nmap-$(NMAP_VERSION).tar.gz
 $(NMAP_TARBALL):
 	rm -rf nmap-$(NMAP_VERSION)
-	svn export .. nmap-$(NMAP_VERSION)
+	git -C .. archive | tar -x -C nmap-$(NMAP_VERSION)
 	tar czf nmap-$(NMAP_VERSION).tar.gz nmap-$(NMAP_VERSION)
 	cp nmap-$(NMAP_VERSION).tar.gz $(JHBUILD_SOURCE)/pkgs/
 
diff --git a/ncat/docs/ncat.usage.txt b/ncat/docs/ncat.usage.txt
index 1a57d443f..7f382e0a1 100644
--- a/ncat/docs/ncat.usage.txt
+++ b/ncat/docs/ncat.usage.txt
@@ -1,4 +1,4 @@
-Ncat 7.99SVN ( https://nmap.org/ncat )
+Ncat 7.991 ( https://nmap.org/ncat )
 Usage: ncat [options] [hostname] [port]
 
 Options taking a time assume seconds. Append 'ms' for milliseconds,
diff --git a/ncat/ncat.h b/ncat/ncat.h
index 392ecba02..a5b85950c 100644
--- a/ncat/ncat.h
+++ b/ncat/ncat.h
@@ -79,7 +79,7 @@
 /* Ncat information for output, etc. */
 #define NCAT_NAME "Ncat"
 #define NCAT_URL "https://nmap.org/ncat"
-#define NCAT_VERSION "7.99SVN"
+#define NCAT_VERSION "7.991"
 
 #ifndef __GNUC__
 #ifndef __attribute__
diff --git a/nmap-services b/nmap-services
index a423f0830..cf2c8dd67 100644
--- a/nmap-services
+++ b/nmap-services
@@ -9679,7 +9679,7 @@ sgi-eventmond	5553/tcp	0.000076	# SGI Eventmond Port
 sgi-eventmond	5553/udp	0.000000	# SGI Eventmond Port
 sgi-esphttp	5554/tcp	0.000076	# SGI ESP HTTP
 sgi-esphttp	5554/udp	0.000000	# SGI ESP HTTP
-freeciv	5555/tcp	0.001305	# personal-agent | Personal Agent
+personal-agent	5555/tcp	0.001305	# Freeciv 1.X | Personal Agent
 rplay	5555/udp	0.001615
 freeciv	5556/tcp	0.000000	# Freeciv gameplay
 freeciv	5556/udp	0.000000	# Freeciv gameplay
diff --git a/nmap.h b/nmap.h
index 72f2a75fe..319305d92 100644
--- a/nmap.h
+++ b/nmap.h
@@ -123,10 +123,10 @@
 /* Edit this definition only within the quotes, because it is read from this
    file by the makefiles. */
 #define NMAP_MAJOR 7
-#define NMAP_MINOR 99
-#define NMAP_BUILD 1
+#define NMAP_MINOR 991
+#define NMAP_BUILD 0
 /* SVN, BETA, etc. */
-#define NMAP_SPECIAL "SVN"
+#define NMAP_SPECIAL ""
 
 #define NMAP_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) NMAP_SPECIAL
 #define NMAP_NUM_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) "." STR(NMAP_BUILD) ".0"
diff --git a/nping/nping.h b/nping/nping.h
index 8059aec4e..44f846e2c 100644
--- a/nping/nping.h
+++ b/nping/nping.h
@@ -265,7 +265,7 @@
 /* General tunable defines  **************************************************/
 #define NPING_NAME "Nping"
 #define NPING_URL "https://nmap.org/nping"
-#define NPING_VERSION "7.99SVN"
+#define NPING_VERSION "7.991"
 
 
 #define DEFAULT_VERBOSITY VB_0