diff --git a/Makefile b/Makefile
index a954f54a6..5db1dfc5a 100644
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,7 @@ else ifeq ($(UNAME), darwin)
 	MACOSXFILES = packaging/macosx
 	EXTRALIBS = $(shell $(PKGCONFIG) --libs gtk-mac-integration) -framework CoreFoundation
 	CFLAGS += $(shell $(PKGCONFIG) --cflags gtk-mac-integration)
+	LDFLAGS += -headerpad_max_install_names
 else
 	OSSUPPORT = windows
 	OSSUPPORT_CFLAGS = $(GTK2CFLAGS)
diff --git a/packaging/macosx/README b/packaging/macosx/README
index 88a383db9..a1a7cdad5 100644
--- a/packaging/macosx/README
+++ b/packaging/macosx/README
@@ -1,22 +1,27 @@
 Creating a Subsurface bundle
+============================
 
 install gtk-mac-bundler (this has been tested with version 0.7.0) and run
 
-gtk-mac-bundler subsurface.bundle
+  $ gtk-mac-bundler subsurface.bundle
 
 This should install a self-contained Subsurface application under /Applications/Subsurface.app
 You still need to manually build a DMG if you want to easily distribute this.
 
-One important caveat is that (at least with MacPorts) you need to build pango like this:
+Caveats
+-------
 
-sudo port install pango +builtin_modules +no_x11 +quartz
+* You need (at least with MacPorts) to build pango like this:
+
+  $ sudo port install pango +builtin_modules +no_x11 +quartz
 
 Without the builtin modules the installed application fails to find the modules and doesn't render any text.
 
-Also, it seems that gtk-mac-bundler expects the charset.alias file to be
-in the ${prefix}/lib folder which it isn't with the current version of
-MacPorts. The following fixes that:
+* It seems that gtk-mac-bundler expects the charset.alias file to be
+  in the ${prefix}/lib folder which it isn't with the current version of
+  MacPorts. The following fixes that:
 
-sudo cp /usr/lib/charset.alias /opt/local/lib
+  $ sudo cp /usr/lib/charset.alias /opt/local/lib
 
+* libdivecomputer needs to be configured with --with-prefix=/opt/local