diff --git a/Makefile b/Makefile
index 3fa77c3f4..638758cd9 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,7 @@ DESKTOPFILE = $(NAME).desktop
 MANFILES = $(NAME).1
 
 MACOSXINSTALL = /Applications/Subsurface.app
-MACOSXICONFILE = macosx/Subsurface.icns
-MACOSXINFOFILE = macosx/Info.plist
-MACOSXPKGFILE = macosx/PkgInfo
+MACOSXFILES = packaging/macosx
 
 # find libdivecomputer
 # First deal with the cross compile environment.
@@ -109,9 +107,11 @@ install-macosx: $(NAME)
 	$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources
 	$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS
 	$(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/
-	$(INSTALL) $(MACOSXINFOFILE) $(MACOSXINSTALL)/Contents/
-	$(INSTALL) $(MACOSXPKGFILE) $(MACOSXINSTALL)/Contents/
-	$(INSTALL) $(MACOSXICONFILE) $(MACOSXINSTALL)/Contents/Resources/
+	$(INSTALL) $(MACOSXFILES)/subsurface.sh $(MACOSXINSTALL)/Contents/MacOS/
+	$(INSTALL) $(MACOSXFILES)/PkgInfo $(MACOSXINSTALL)/Contents/
+	$(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXINSTALL)/Contents/
+	$(INSTALL) $(ICONFILE) $(MACOSXINSTALL)/Contents/Resources/
+	$(INSTALL) $(MACOSXFILES)/Subsurface.icns $(MACOSXINSTALL)/Contents/Resources/
 
 parse-xml.o: parse-xml.c dive.h
 	$(CC) $(CFLAGS) $(GLIB2CFLAGS) -c $(XML2CFLAGS)  parse-xml.c
diff --git a/macosx/Info.plist b/packaging/macosx/Info.plist
similarity index 94%
rename from macosx/Info.plist
rename to packaging/macosx/Info.plist
index 62d92b152..4ee12438b 100644
--- a/macosx/Info.plist
+++ b/packaging/macosx/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
-	<string>subsurface</string>
+	<string>subsurface.sh</string>
 	<key>CFBundleIdentifier</key>
 	<string>torvalds.subsurface</string>
 </dict>
diff --git a/macosx/PkgInfo b/packaging/macosx/PkgInfo
similarity index 100%
rename from macosx/PkgInfo
rename to packaging/macosx/PkgInfo
diff --git a/macosx/Subsurface.icns b/packaging/macosx/Subsurface.icns
similarity index 100%
rename from macosx/Subsurface.icns
rename to packaging/macosx/Subsurface.icns
diff --git a/packaging/macosx/subsurface.sh b/packaging/macosx/subsurface.sh
new file mode 100755
index 000000000..ee9427c37
--- /dev/null
+++ b/packaging/macosx/subsurface.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd `dirname $0`/../Resources
+../MacOS/subsurface &
+exit 0