diff --git a/build.xml b/build.xml
index 7648b3c3..5f2eb25b 100755
--- a/build.xml
+++ b/build.xml
@@ -455,13 +455,11 @@
 			<fileset dir="ext/mac-bundle"/>
 		</copy>
 		
-		<copy file="${dist}/${ant.project.name}-mac-${version}.jar" todir="${dist}/${name}.app/Contents/Resources/Java"/>
+		<copy file="${dist}/${ant.project.name}-mac-${version}.jar" todir="${dist}/${name}.app/Contents/MacOS"/>
 		
 		<replace file="${dist}/${name}.app/Contents/Info.plist">
 			<replacefilter token="APPNAME" value="${name}"/>
 			<replacefilter token="VERSION" value="${version}"/>
-			<replacefilter token="JARFILE" value="${ant.project.name}-mac-${version}.jar"/>
-			<replacefilter token="MAINCLASS" value="${main.class}"/>
 		</replace>
 		
 		<zip destfile="${dist}/${ant.project.name}-mac-${version}.zip">
diff --git a/ext/mac-bundle/Angry IP Scanner.app/Contents/Info.plist b/ext/mac-bundle/Angry IP Scanner.app/Contents/Info.plist
index 8744c006..abb1b545 100644
--- a/ext/mac-bundle/Angry IP Scanner.app/Contents/Info.plist	
+++ b/ext/mac-bundle/Angry IP Scanner.app/Contents/Info.plist	
@@ -1,64 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-    <key>CFBundleName</key>
-    <string>APPNAME</string>
-
-    <key>CFBundleShortVersionString</key>
-    <string>VERSION</string>
-
-    <key>CFBundleGetInfoString</key>
-    <string>VERSION</string>
-
-    <key>CFBundleIconFile</key>
-    <string>ipscan.icns</string>
-
-    <key>CFBundleAllowMixedLocalizations</key>
-    <string>false</string>
-
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-
-    <key>CFBundleExecutable</key>
-    <string>ipscan</string>
-
-    <key>CFBundleDevelopmentRegion</key>
-    <string>English</string>
-
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-
-    <key>CFBundleSignature</key>
-    <string>????</string>
-
-    <key>CFBundleVersion</key>
-    <string>VERSION</string>
-
-    <key>CFBundleIdentifier</key>
-    <string>net.azib.ipscan</string>
-
-    <key>NSHighResolutionCapable</key>
-    <true/>
-
-    <key>Java</key>
     <dict>
-        <key>MainClass</key>
-        <string>MAINCLASS</string>
-
-        <key>JVMVersion</key>
-        <string>1.6+</string>
-
-        <key>ClassPath</key>
-        <array>
-            <string>$JAVAROOT/JARFILE</string>
-        </array>
-
-        <key>StartOnMainThread</key>
+        <key>CFBundleExecutable</key>
+        <string>ipscan</string>
+        <key>CFBundleGetInfoString</key>
+        <string>APPNAME VERSION - fast and friendly network scanner</string>
+        <key>CFBundleIconFile</key>
+        <string>ipscan.icns</string>
+        <key>CFBundleIdentifier</key>
+        <string>net.azib.ipscan</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundleName</key>
+        <string>APPNAME</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>VERSION</string>
+        <key>CFBundleSignature</key>
+        <string>?????</string>
+        <key>CFBundleVersion</key>
+        <string>1.0</string>
+        <key>NSPrincipalClass</key>
+        <string>NSApplication</string>
+        <key>NSHighResolutionCapable</key>
         <true/>
-
-        <key>VMOptions</key>
-        <string>-XstartOnFirstThread</string>
     </dict>
-</dict>
 </plist>
diff --git a/ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan b/ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan
old mode 100755
new mode 100644
index ceaa8672..1a2a3704
Binary files a/ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan and b/ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan differ
diff --git a/ext/mac-bundle/Angry IP Scanner.app/Contents/PkgInfo b/ext/mac-bundle/Angry IP Scanner.app/Contents/PkgInfo
deleted file mode 100644
index 6f749b0f..00000000
--- a/ext/mac-bundle/Angry IP Scanner.app/Contents/PkgInfo	
+++ /dev/null
@@ -1 +0,0 @@
-APPL????