diff --git a/macosx/Makefile b/macosx/Makefile
index efdd5184d..845b8fffc 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -26,6 +26,9 @@ NDIFF_STAGING_DIR = Ndiff
 NPING_BUILD_DIR = nping-build
 NPING_STAGING_DIR = Nping
 
+NMAP_UPDATE_BUILD_DIR = nmap-update-build
+NMAP_UPDATE_STAGING_DIR = nmap-update
+
 MACPORTS_PREFIX=$(HOME)/macports-10.5
 PREFIX = /usr/local
 
@@ -77,13 +80,13 @@ export-%:
 	svn export ..@BASE $*
 
 stage-nmap: export-$(NMAP_BUILD_DIR)
-	cd $(NMAP_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --without-nping $(CONFIGURE_ARGS)
+	cd $(NMAP_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --without-nping --without-nmap-update $(CONFIGURE_ARGS)
 	make -C $(NMAP_BUILD_DIR)
 	rm -rf $(NMAP_STAGING_DIR)
 	make -C $(NMAP_BUILD_DIR) install DESTDIR="`pwd`/$(NMAP_STAGING_DIR)"
 
 stage-ncat: export-$(NCAT_BUILD_DIR)
-	cd $(NCAT_BUILD_DIR) && ./configure --without-zenmap --with-ncat --without-ndiff --without-nping $(CONFIGURE_ARGS)
+	cd $(NCAT_BUILD_DIR) && ./configure --without-zenmap --with-ncat --without-ndiff --without-nping --without-nmap-update $(CONFIGURE_ARGS)
 	make -C $(NCAT_BUILD_DIR)
 	rm -rf $(NCAT_STAGING_DIR)
 	make -C $(NCAT_BUILD_DIR) install-ncat DESTDIR="`pwd`/$(NCAT_STAGING_DIR)"
@@ -92,11 +95,17 @@ stage-nping: export-$(NPING_BUILD_DIR)
 # Link against the local MacPorts openssl because the 10.4u SDK doesn't
 # have EVP_sha256, used by Nping. We let configure find the libraries
 # dynamically, then link with the static libraries with "make".
-	cd $(NPING_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --with-nping --with-openssl="$(MACPORTS_PREFIX)" $(CONFIGURE_ARGS)
+	cd $(NPING_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --with-nping --without-nmap-update --with-openssl="$(MACPORTS_PREFIX)" $(CONFIGURE_ARGS)
 	make -C $(NPING_BUILD_DIR) OPENSSL_LIBS="$(MACPORTS_PREFIX)/lib/libssl.a $(MACPORTS_PREFIX)/lib/libcrypto.a $(MACPORTS_PREFIX)/lib/libz.a"
 	rm -rf $(NPING_STAGING_DIR)
 	make -C $(NPING_BUILD_DIR) install-nping DESTDIR="`pwd`/$(NPING_STAGING_DIR)"
 
+stage-nmap-update: export-$(NMAP_UPDATE_BUILD_DIR)
+	cd $(NMAP_UPDATE_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --without-nping --with-nmap-update $(CONFIGURE_ARGS)
+	make -C $(NMAP_UPDATE_BUILD_DIR)
+	rm -rf $(NMAP_UPDATE_STAGING_DIR)
+	make -C $(NMAP_UPDATE_BUILD_DIR) install-nmap-update DESTDIR="`pwd`/$(NMAP_UPDATE_STAGING_DIR)"
+
 # make-bundle.sh uses these to build its authorization wrapper.
 export CC ARCHFLAGS CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
 
diff --git a/macosx/nmap.pmdoc/06nmap-update-contents.xml b/macosx/nmap.pmdoc/06nmap-update-contents.xml
new file mode 100644
index 000000000..8d0e75e65
--- /dev/null
+++ b/macosx/nmap.pmdoc/06nmap-update-contents.xml
@@ -0,0 +1,3 @@
+<pkg-contents spec="1.12">
+  <f n="nmap-update" pt="nmap-update" m="false" t="file"/>
+</pkg-contents>
diff --git a/macosx/nmap.pmdoc/06nmap-update.xml b/macosx/nmap.pmdoc/06nmap-update.xml
new file mode 100644
index 000000000..9eac01e63
--- /dev/null
+++ b/macosx/nmap.pmdoc/06nmap-update.xml
@@ -0,0 +1,25 @@
+<pkgref spec="1.12" uuid="A488395A-3951-449A-B3F6-A74D5E926D69">
+  <config>
+    <identifier>org.insecure.nmap.nmap-update.pkg</identifier>
+    <version>1</version>
+    <description />
+    <post-install type="none" />
+    <requireAuthorization />
+    <installFrom relative="true" includeRoot="false">nmap-update</installFrom>
+    <installTo>/</installTo>
+    <flags>
+      <followSymbolicLinks />
+    </flags>
+    <packageStore type="internal" />
+    <mod>parent</mod>
+    <mod>installFrom.isRelativeType</mod>
+  </config>
+  <contents>
+    <file-list>06nmap-update-contents.xml</file-list>
+    <filter>/CVS$</filter>
+    <filter>/\.svn$</filter>
+    <filter>/\.cvsignore$</filter>
+    <filter>/\.cvspass$</filter>
+    <filter>/\.DS_Store$</filter>
+  </contents>
+</pkgref>
diff --git a/macosx/nmap.pmdoc/index.xml b/macosx/nmap.pmdoc/index.xml
index 77d87c109..79a203408 100644
--- a/macosx/nmap.pmdoc/index.xml
+++ b/macosx/nmap.pmdoc/index.xml
@@ -36,6 +36,11 @@
     starts_enabled="true" starts_hidden="false">
       <pkgref id="org.insecure.nmap.Nping.pkg" />
     </choice>
+    <choice title="nmap-update" id="choice97" starts_selected="true"
+    description="nmap-update updater for architecture-independent files."
+    starts_enabled="true" starts_hidden="false">
+      <pkgref id="org.insecure.nmap.nmap-update.pkg" />
+    </choice>
   </contents>
   <resources bg-scale="none" bg-align="topleft">
     <locale lang="en">
@@ -49,6 +54,7 @@
   <item type="file">03ncat.xml</item>
   <item type="file">04ndiff.xml</item>
   <item type="file">05nping.xml</item>
+  <item type="file">06nmap-update.xml</item>
   <mod>properties.customizeOption</mod>
   <mod>properties.title</mod>
   <mod>properties.anywhereDomain</mod>