diff --git a/CHANGELOG b/CHANGELOG
index 3d54b1a01..c251723ec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
-Nmap 4.20SOC-ALPHA1
+Nmap 4.20ALPHA1
 
 o Integrated initial 2nd generation OS detection patch!  The system is
   documented at http://insecure.org/nmap/osdetect/ .  Thanks to Zhao Lei
diff --git a/Makefile.in b/Makefile.in
index 61da15b0b..303422509 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-export NMAP_VERSION = 4.20SOC-ALPHA1
+export NMAP_VERSION = 4.20ALPHA1
 NMAP_NAME= Nmap
 NMAP_URL= http://www.insecure.org/nmap/
 NMAP_PLATFORM=@host@
diff --git a/docs/nmap.1 b/docs/nmap.1
index 68c7b58b1..6b525887b 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "NMAP" "1" "06/23/2006" "" "Nmap Reference Guide"
+.TH "NMAP" "1" "06/24/2006" "" "Nmap Reference Guide"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index a4eee144a..bd5f7e5f0 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 4.11 ( http://www.insecure.org/nmap/ )
+Nmap 4.20ALPHA1 ( http://www.insecure.org/nmap/ )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
diff --git a/nmap_winconfig.h b/nmap_winconfig.h
index d3f945d28..7c03e1614 100644
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@@ -106,7 +106,7 @@
 /* Without this, Windows will give us all sorts of crap about using functions
    like strcpy() even if they are done safely */
 #define _CRT_SECURE_NO_DEPRECATE 1
-#define NMAP_VERSION "4.20SOC-ALPHA1"
+#define NMAP_VERSION "4.20ALPHA1"
 #define NMAP_NAME "Nmap"
 #define NMAP_URL "http://www.insecure.org/nmap"
 #define NMAP_PLATFORM "i686-pc-windows-windows"
diff --git a/scripts/Makefile b/scripts/Makefile
index d630ee83f..13a3daf29 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -47,7 +47,7 @@ distro:
 	cd .. && ./configure
 	cd ../$(LIBPCAPDIR) && ./configure
 	$(MAKE) -C .. clean
-	$(MAKE) -C ..
+	$(MAKE) -C .. -j3
 	../nmap -h > /dev/null    #Make sure nmap exists
 	rm -f ../docs/nmap.usage.txt	
 	../nmap -h > ../docs/nmap.usage.txt