diff --git a/macosx/Makefile b/macosx/Makefile
index 78633b465..b5452254b 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -71,17 +71,25 @@ LDFLAGS += $(UNIVERSAL_LDFLAGS)
 PYTHON = $(JHBUILD_PREFIX)/bin/python2.7
 OPENSSL_STATIC = $(JHBUILD_PREFIX)/lib/libssl.a $(JHBUILD_PREFIX)/lib/libcrypto.a
 
-$(IMAGE_NAME): $(IMAGE_STAGING_DIR)/$(PKG_NAME)
+$(IMAGE_NAME): path-check tool-checks $(IMAGE_STAGING_DIR)/$(PKG_NAME)
 	rm -f $@
 	hdiutil create -imagekey zlib-level=9 -srcfolder $(IMAGE_STAGING_DIR) $@
 
+path-check:
+	if (echo $(PATH) | grep -F "$(MACPORTS_PREFIX)"); then false; else echo "Path is OK"; fi
+
+tool-checks: have-$(CC) have-jhbuild have-gtk-mac-bundler
+
+have-%:
+	which $*
+
 $(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping check-nmap-update COPYING.formatted
 	mkdir -p $(IMAGE_STAGING_DIR)
 	cp -rf $(EXTRA_DIST) $(IMAGE_STAGING_DIR)/
 	$(PACKAGEMAKER) --doc nmap.pmdoc --title "Nmap $(NMAP_VERSION)" --no-relocate -o $@
 
 check-%: stage-%
-	if (find $* -perm -a+x -type f | xargs otool -L | grep "$(JHBUILD_PREFIX)"); then false; else echo "Libs are clean"; fi
+	if (find $* -perm -a+x -type f | xargs otool -L | grep -F "$(JHBUILD_PREFIX)"); then false; else echo "Libs are clean"; fi
 
 export-%:
 	rm -rf $*
diff --git a/zenmap/install_scripts/macosx/make-bundle.sh b/zenmap/install_scripts/macosx/make-bundle.sh
index 5919bc5df..3d57a990f 100755
--- a/zenmap/install_scripts/macosx/make-bundle.sh
+++ b/zenmap/install_scripts/macosx/make-bundle.sh
@@ -25,7 +25,7 @@ echo "Building bundle"
 # jhbuild build meta-gtk-osx-bootstrap
 # jhbuild build meta-gtk-osx-core
 # jhbuild build meta-gtk-osx-python
-gtk-mac-bundler "$SCRIPT_DIR/zenmap.bundle"
+jhbuild run gtk-mac-bundler "$SCRIPT_DIR/zenmap.bundle"
 
 echo "Stripping unoptimized Python libraries"
 #Remove some stuff that is unneeded. This cuts 40M off the installed size.
@@ -45,8 +45,8 @@ find "$BASE/Resources/lib/python2.7" -type f -name '*.pyo' | while read py; do
 done
 
 echo "Building using distutils"
-python setup.py build --executable "/usr/bin/env python"
-python setup.py install vanilla --prefix "$BASE/Resources"
+jhbuild run python setup.py build --executable "/usr/bin/env python"
+jhbuild run python setup.py install vanilla --prefix "$BASE/Resources"
 
 # This isn't truly necessary, but it allows us to do a simpler check for problems later.
 echo "Rewriting linker paths to pass checks"