diff --git a/build/build.xml b/build/build.xml
index c0b6f4ed..d3ec99de 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -722,6 +722,7 @@
 		<path id="osx.lib">
 			<fileset dir="${target.build}/lib">
 				<include name="**/*.jar"/>
+				<include name="**/*.jnilib"/>
 				<exclude name="**/windows/"/>
 				<exclude name="**/linux/"/>
 			</fileset>
@@ -748,6 +749,7 @@
 					jrepreferred="true">
 			<arch name="x86_64"/>
 			<arch name="i386"/>
+			<option value="-Djava.library.path=$APP_ROOT/Contents/Java/"/>
 			<option value="-Xdock:name=Spark"/>
 
 		</appbundler>
@@ -762,11 +764,6 @@
 			</fileset>
 		</copy>
 
-		<!-- When building on PowerPC Macs we get a PowerPC binary for the JavaApplicationStub. We've gotten a few requests to fix that from the forums, so we'll manually copy one from an Intel Mac -->
-		<copy todir="${mac.app.file}/Contents/MacOS">
-			<fileset file="${basedir}/src/resources/JavaApplicationStub"/>
-		</copy>
-
 		<delete file="${plugins}/jniwrapper.jar"/>
 	</target>
 
diff --git a/src/resources/JavaApplicationStub b/src/resources/JavaApplicationStub
deleted file mode 100755
index f61e83de..00000000
Binary files a/src/resources/JavaApplicationStub and /dev/null differ
diff --git a/src/resources/startup.sh b/src/resources/startup.sh
index b3f26c86..ad1762a0 100644
--- a/src/resources/startup.sh
+++ b/src/resources/startup.sh
@@ -10,6 +10,15 @@ ${libdir}/jdom.jar:\
 ${libdir}/log4j.jar:\
 ${libdir}/lti-civil.jar:\
 ${libdir}/fmj.jar:\
+${libdir}/jspeex.jar:\
+${libdir}/libjitsi.jar:\
+${libdir}/zrtp4j-light.jar:\
+${libdir}/jna.jar:\
+${libdir}/bcpkix.jar:\
+${libdir}/bcprov.jar:\
+${libdir}/bccontrib.jar:\
+${libdir}/ice4j.jar:\
+${libdir}/osgi.core.jar:\
 ${libdir}/startup.jar:\
 ${libdir}/linux/jdic.jar:\
 ${wd}/resources\