diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index d91714038f..d13922a9a4 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -594,6 +594,11 @@ if $(HOST_PLATFORM) = freebsd {
 
 if $(HOST_PLATFORM) = darwin {
 	HOST_HDRS += [ FDirName $(HAIKU_TOP) src build libgnuregex ] ;
+
+	# Mac OS X users may be using macports libraries, in which case the headers
+	# and the libs are located in /opt/local/.
+	HOST_HDRS += /opt/local/include ;
+	HOST_LINKFLAGS += -L/opt/local/lib ;
 }
 
 HOST_BE_API_HEADERS =
diff --git a/src/tools/hvif2png/Jamfile b/src/tools/hvif2png/Jamfile
index 10b698c2e2..1048fb3049 100644
--- a/src/tools/hvif2png/Jamfile
+++ b/src/tools/hvif2png/Jamfile
@@ -7,5 +7,5 @@ USES_BE_API on <build>hvif2png = true ;
 BuildPlatformMain <build>hvif2png :
 	hvif2png.cpp
 	:
-	$(HOST_LIBBE) $(HOST_LIBROOT) png 
+	$(HOST_LIBBE) $(HOST_LIBROOT) $(HOST_LIBSUPC++) png
 ;