diff --git a/CHANGELOG b/CHANGELOG
index a0826c789..a53d99a48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Ndiff] Fixed the Mac OS X packages to use the correct path for
+  Python: /usr/bin/python instead of /opt/local/bin/python. The bug
+  was reported by Wellington Castello. [David]
+
 o [NSE] Added nping-brute.nse by Toni Ruottu, which tries to guess
   the passphrase of an Nping Echo server.
 
diff --git a/macosx/Makefile b/macosx/Makefile
index 6cdb22aac..cead1123f 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -33,7 +33,7 @@ PACKAGEMAKER = /Developer/usr/bin/packagemaker
 
 EXTRA_DIST = README ../COPYING ../docs/3rd-party-licenses.txt ../docs/licenses
 
-CONFIGURE_ARGS = --prefix="$(PREFIX)" --with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ARGS = --prefix="$(PREFIX)" --with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" PYTHON="$(PYTHON)"
 
 # Flags for building universal binaries. See
 # http://developer.apple.com/documentation/Porting/Conceptual/PortingUnix/compiling/chapter_4_section_3.html.
@@ -62,6 +62,8 @@ CFLAGS += $(UNIVERSAL_CFLAGS)
 CXXFLAGS += $(UNIVERSAL_CXXFLAGS)
 LDFLAGS += $(UNIVERSAL_LDFLAGS)
 
+PYTHON = /usr/bin/python
+
 $(IMAGE_NAME): $(IMAGE_STAGING_DIR)/$(PKG_NAME)
 	rm -f $@
 	hdiutil create -imagekey zlib-level=9 -srcfolder $(IMAGE_STAGING_DIR) $@