diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..33e64a3
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "universalJavaApplicationStub"]
+	path = universalJavaApplicationStub
+	url = ./universalJavaApplicationStub
diff --git a/ant-libs/jarbundler-2.3.2.jar b/ant-libs/jarbundler-2.3.2.jar
new file mode 100644
index 0000000..31fe985
Binary files /dev/null and b/ant-libs/jarbundler-2.3.2.jar differ
diff --git a/build.xml b/build.xml
index a9b38ec..18f9c6b 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <project name="Audiobook Recorder" default="build">
 
+    <taskdef name="jarbundler" classname="com.ultramixer.jarbundler.JarBundler" classpath="ant-libs/jarbundler-2.3.2.jar" />
+
     <target name="clean" description="Clean out the build directories">
         <delete dir="bin" />
         <delete file="AudiobookRecorder.jar" />
@@ -43,4 +45,55 @@
         <chmod perm="0755" file="uecide.jar" />
     </target>
 
+    <target name="release" depends="macapp">
+    </target>
+
+    <target name="macapp" depends="build">
+
+    <mkdir dir="tmp"/>
+
+    <jarbundler
+        name="AudiobookRecorder"
+        shortname="AudiobookRecorder"
+        icon="dist/macosx/audiobookrecorder.icns"
+        stubfile="universalJavaApplicationStub/src/universalJavaApplicationStub"
+        dir="tmp"
+        jar="AudiobookRecorder.jar"
+        mainclass="uk.co.majenko.audiobookrecorder.AudiobookRecorder"
+        jvmversion="1.7+"
+        >
+    </jarbundler>
+
+<!--
+        <mkdir dir="tmp/AudiobookRecorder.app"/>
+        <copy todir="tmp/AudiobookRecorder.app">
+            <fileset dir="dist/macosx/template.app" includes="*/**"/>
+        </copy>
+
+        <replace file="tmp/AudiobookRecorder.app/Contents/Info.plist" token="{version}" value="0.0.4" />
+
+        <copy file="AudiobookRecorder.jar" todir="tmp/AudiobookRecorder.app/Contents/Resources/Java" />
+-->
+
+        <symlink link="tmp/Applications" resource="/Applications" overwrite="true" />
+
+        <exec executable="genisoimage">
+            <arg value="-D" />
+            <arg value="-V" />
+            <arg value="AudiobookRecorder" />
+            <arg value="-no-pad" />
+            <arg value="-r" />
+            <arg value="-apple" />
+            <arg value="-o" />
+            <arg value="AudiobookRecorder.dmg" />
+            <arg value="-dir-mode" />
+            <arg value="0755" />
+            <arg value="-file-mode" />
+            <arg value="0755" />
+            <arg value="tmp" />
+        </exec>
+
+        <!--delete dir="tmp" /-->
+    </target>
+
 </project>
diff --git a/dist/macosx/audiobookrecorder.icns b/dist/macosx/audiobookrecorder.icns
new file mode 100644
index 0000000..7893390
Binary files /dev/null and b/dist/macosx/audiobookrecorder.icns differ
diff --git a/universalJavaApplicationStub b/universalJavaApplicationStub
new file mode 160000
index 0000000..ebe2dba
--- /dev/null
+++ b/universalJavaApplicationStub
@@ -0,0 +1 @@
+Subproject commit ebe2dbaf92e7c8165ebb33b1ee801fbf57bd92c0