diff --git a/CHANGELOG b/CHANGELOG
index d3df9bd61..0d67afe6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$)
 
+Nmap 3.90
+
 o Added the ability for Nmap to send and properly route raw ethernet
   packets cointaining IP datagrams rather than always sending the
   packets via raw sockets. This is particularly useful for Windows,
@@ -63,6 +65,11 @@ o Nmap on Windows now compiles/links with the new WinPcap 3.1
   http://www.winpcap.org before installing this version of Nmap.
   While older versions may still work, they aren't supported with Nmap.
 
+o The official Nmap RPM files are now compiled staticly for better
+  compatability with other systems.  X86_64 (AMD Athlon64/Opteron)
+  binaries are now available in addition to the standard i386.  NmapFE
+  RPMs are no longer distributed by Insecure.Org.
+
 o Nmap distribution signing has changed. Release files are now signed
   with a new Nmap Project GPG key (KeyID 6B9355D0).  Fyodor has also
   generated a new key for himself (KeyID 33599B5F).  The Nmap key has
@@ -273,6 +280,9 @@ o Added new --privileged command-line option and NMAP_PRIVILEGED
   flag or variable set, Nmap bails on UNIX if geteuid() is
   nonzero.
 
+o Changed the RPM spec file so that if you define "static" to 1 (by
+  passing --define "static 1" to rpmbuild), static binaries are built.
+
 o Fixed Nmap compilation on Solaris x86 thanks to a patch from Simon
   Burr (simes(a)bpfh.net).
 
diff --git a/Makefile.in b/Makefile.in
index e44a714af..78b915192 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_L
 SHTOOL = ./shtool
 INSTALL = $(SHTOOL) install 
 MAKEDEPEND = @MAKEDEPEND@
-export RPMTDIR=$(HOME)/rpmdir
+export RPMTDIR=$(HOME)/rpm
 
 # DESTDIR is used by some package maintainers to install Nmap under
 # its usual directory structure into a different tree.  See the 
@@ -96,6 +96,10 @@ nmapfe/nmapfe:
 #	-cd nmapfe; test -f Makefile && $(MAKE) VERSION=$(NMAP_VERSION) STATIC=$(STATIC);
 #	@echo "END OF SECTION WHERE FAILURES ARE OK"
 
+# Make a statically compiled binary for portability between distributions
+static:
+	$(MAKE) STATIC=-static
+
 # Make the Nmap tarball
 distro:
 	cd scripts && $(MAKE) distro
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index ea1f95173..7743b079f 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 3.84ALPHA2 Usage: nmap [Scan Type(s)] [Options] <host or net list>
+Nmap 3.90 Usage: nmap [Scan Type(s)] [Options] <host or net list>
 Some Common Scan Types ('*' options require root privileges)
 * -sS TCP SYN stealth port scan (default if privileged (root))
   -sT TCP connect() port scan (default for unprivileged users)
diff --git a/nmap.spec.in b/nmap.spec.in
index 174c31b2f..b9aafda0c 100644
--- a/nmap.spec.in
+++ b/nmap.spec.in
@@ -3,9 +3,11 @@
 %define release 1
 %define prefix /usr
 
-# to not build the frontend, add:
+# To not build the frontend, add:
 #   --define "buildfe 0"
 # ...to the rpm build command-line
+# To build a static rpm, add:
+# --define "static 1"
 
 %if "%{buildfe}" != "0"
 %define buildfe 1
@@ -54,7 +56,11 @@ be installed before installing nmap-frontend.
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 ./configure --prefix=%{prefix} --mandir=%{prefix}/share/man --without-openssl
-make 
+%if "%{static}" == "1"
+make static
+%else
+make
+%endif
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
diff --git a/scripts/Makefile b/scripts/Makefile
index e28ef718d..cd8c29558 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -179,7 +179,9 @@ distro:
 # Make the actual RPM
 # Note -- on newer systems rpmbuild -ta is needed instead.
 #	rpm -ta /usr/tmp/nmap-$(NMAP_VERSION).tgz
+	rpmbuild -ta --define "buildfe 0" --define "static 1" /usr/tmp/nmap-$(NMAP_VERSION).tgz
+	cp -f $(RPMTDIR)/RPMS/x86_64/nmap-$(NMAP_VERSION)-1.x86_64.rpm /usr/tmp
 #	cp -f $(RPMTDIR)/RPMS/i386/nmap-$(NMAP_VERSION)-1.i386.rpm /usr/tmp
 #	cp -f $(RPMTDIR)/RPMS/i386/nmap-frontend-$(NMAP_VERSION)-1.i386.rpm /usr/tmp
-#	cp -f $(RPMTDIR)/SRPMS/nmap-$(NMAP_VERSION)-1.src.rpm /usr/tmp
+	cp -f $(RPMTDIR)/SRPMS/nmap-$(NMAP_VERSION)-1.src.rpm /usr/tmp
 	rm -rf /usr/tmp/nmap-$(NMAP_VERSION)