diff --git a/build.xml b/build.xml
index 10e59f3e..4cbe3ada 100644
--- a/build.xml
+++ b/build.xml
@@ -142,20 +142,22 @@
 
 	<target name="appbundle" depends="fatjar" description="Build an OSX application bundle">
 		<taskdef name="jarbundler" classname="net.sourceforge.jarbundler.JarBundler" classpath="${dir.installer}/appbundle/jarbundler.jar" />
-
+		<copy tofile="${dir.dist}/appbundle/FileBot.jar" file="${path.fatjar}" />
+		
 		<!-- build app bundle folder and add native libs -->
-		<jarbundler dir="${dir.dist}" name="${title}" version="${version}" icon="${dir.installer}/appbundle/icon.icns" bundleid="net.sourceforge.filebot" jar="${path.fatjar}" stubfile="${dir.installer}/appbundle/JavaApplicationStub" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" mainclass="net.sourceforge.filebot.Main" jvmversion="1.6+" vmoptions="-Xmx256m">
+		<jarbundler dir="${dir.dist}" name="${title}" version="${version}" icon="${dir.installer}/appbundle/icon.icns" bundleid="net.sourceforge.filebot" jar="${dir.dist}/appbundle/FileBot.jar" stubfile="${dir.installer}/appbundle/JavaApplicationStub" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" mainclass="net.sourceforge.filebot.Main" jvmversion="1.6+" vmoptions="-Xmx256m">
 			<javaproperty name="application.deployment" value="app"/>
 		</jarbundler>
 		
+		<copy todir="${dir.dist}/${title}.app/Contents/MacOS" file="${dir.installer}/appbundle/filebot" />
 		<copy todir="${dir.dist}/${title}.app/Contents/Resources/Java">
 			<fileset dir="${dir.lib}/native/mac-x86_64" includes="*.dylib" />
 		</copy>
 
 		<!-- application bundle folder as .tar.gz -->
 		<tar destfile="${path.appbundle.tar.gz}" compression="gzip">
-			<tarfileset dir="${dir.dist}" includes="${title}.app/**" excludes="**/JavaApplicationStub" />
-			<tarfileset dir="${dir.dist}" includes="${title}.app/**/JavaApplicationStub" filemode="755" /> <!-- application stub must be executable!! -->
+			<tarfileset dir="${dir.dist}" includes="${title}.app/**" excludes="**/MacOS/**" />
+			<tarfileset dir="${dir.dist}" includes="${title}.app/**/MacOS/**" filemode="755" /> <!-- application stub must be executable!! -->
 		</tar>
 	</target>
 
diff --git a/installer/appbundle/filebot b/installer/appbundle/filebot
new file mode 100644
index 00000000..d8ac8f9d
--- /dev/null
+++ b/installer/appbundle/filebot
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# UNTESTED ON OSX, PROBABLY DOESN'T WORK!!
+# Help me fix this startup script! Contact me at rednoah@users.sourceforge.net
+java -Dapplication.deployment=app "-Djna.library.path=../Resources/Java" -Xmx256m -jar "../Resources/Java/FileBot.jar" "$@"
diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 1c490bb5..edbcfecb 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -1 +1,2 @@
-java -Dapplication.deployment=deb -Djna.library.path=/usr/share/filebot -Xmx256m -jar /usr/share/filebot/FileBot.jar "$@"
\ No newline at end of file
+#!/bin/bash
+java -Dapplication.deployment=deb -Djna.library.path=/usr/share/filebot -Xmx256m -jar /usr/share/filebot/FileBot.jar "$@"
diff --git a/installer/msi/filebot.cmd b/installer/msi/filebot.cmd
index e6964f82..ba326b6f 100644
--- a/installer/msi/filebot.cmd
+++ b/installer/msi/filebot.cmd
@@ -1,2 +1,2 @@
 @ECHO OFF
-java -Dapplication.deployment=msi -Xmx256m -jar "%~dp0FileBot.jar" %*
\ No newline at end of file
+java -Dapplication.deployment=msi -Xmx256m -jar "%~dp0FileBot.jar" %*