diff --git a/build/build.xml b/build/build.xml
index 89c561b..e7dac59 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -150,12 +150,12 @@
 			bundleid="com.webcodepro.applecommander"
 			jar="${dist}/AppleCommander-${acVersion}.jar"
 			version="${acVersion}" build="${acVersion}"
-			stubfile="mac/universalJavaApplicationStub"
-			icon="mac/AppleCommander.app/Contents/Resources/AppleCommander.icns"
+			stubfile="${mac.dir}/universalJavaApplicationStub"
+			icon="${mac.dir}/AppleCommander.icns"
 			useJavaXKey="true"
 			developmentregion="English"
 			copyright="Copyright 2002-2008 Rob Greene and John B. Matthews."
-			jvmversion="1.4*"
+			jvmversion="1.6+"
 			/>
 
 		<!--
diff --git a/mac/AppleCommander.app/Contents/.cvsignore b/mac/AppleCommander.app/Contents/.cvsignore
deleted file mode 100644
index 4e432c2..0000000
--- a/mac/AppleCommander.app/Contents/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Info.plist
diff --git a/mac/AppleCommander.app/Contents/MacOS/JavaApplicationStub b/mac/AppleCommander.app/Contents/MacOS/JavaApplicationStub
deleted file mode 100755
index 4190041..0000000
Binary files a/mac/AppleCommander.app/Contents/MacOS/JavaApplicationStub and /dev/null differ
diff --git a/mac/AppleCommander.app/Contents/PkgInfo b/mac/AppleCommander.app/Contents/PkgInfo
deleted file mode 100644
index 6f749b0..0000000
--- a/mac/AppleCommander.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
diff --git a/mac/AppleCommander.app/Contents/Resources/Java/.cvsignore b/mac/AppleCommander.app/Contents/Resources/Java/.cvsignore
deleted file mode 100644
index f58bed4..0000000
--- a/mac/AppleCommander.app/Contents/Resources/Java/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-AppleCommander.jar
diff --git a/mac/AppleCommander.app/Contents/Resources/Java/libswt-carbon-3349.jnilib b/mac/AppleCommander.app/Contents/Resources/Java/libswt-carbon-3349.jnilib
deleted file mode 100644
index f18e1f7..0000000
Binary files a/mac/AppleCommander.app/Contents/Resources/Java/libswt-carbon-3349.jnilib and /dev/null differ
diff --git a/mac/AppleCommander.app/Contents/Resources/Java/libswt-pi-carbon-3349.jnilib b/mac/AppleCommander.app/Contents/Resources/Java/libswt-pi-carbon-3349.jnilib
deleted file mode 100644
index 92838d5..0000000
Binary files a/mac/AppleCommander.app/Contents/Resources/Java/libswt-pi-carbon-3349.jnilib and /dev/null differ
diff --git a/mac/AppleCommander.app/Contents/Resources/Java/swt.jar b/mac/AppleCommander.app/Contents/Resources/Java/swt.jar
deleted file mode 100644
index fba6811..0000000
Binary files a/mac/AppleCommander.app/Contents/Resources/Java/swt.jar and /dev/null differ
diff --git a/mac/AppleCommander.app/Contents/Resources/AppleCommander.icns b/mac/AppleCommander.icns
similarity index 100%
rename from mac/AppleCommander.app/Contents/Resources/AppleCommander.icns
rename to mac/AppleCommander.icns
diff --git a/mac/Info.plist b/mac/Info.plist
deleted file mode 100644
index 4544aa4..0000000
--- a/mac/Info.plist
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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>CFBundleDevelopmentRegion</key>
-    <string>English</string>
-
-    <key>CFBundleExecutable</key>
-    <string>JavaApplicationStub</string>
-
-    <key>CFBundleGetInfoString</key>
-    <string>@version@: Distributed under the terms of the GNU Public license.</string>
-
-    <key>CFBundleIconFile</key>
-    <string>AppleCommander.icns</string>
-
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-
-    <key>CFBundleName</key>
-    <string>AppleCommander</string>
-
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-
-    <key>CFBundleSignature</key>
-    <string>????</string>
-
-    <key>CFBundleShortVersionString</key>
-    <string>@version@</string>
-
-    <key>CFBundleVersion</key>
-    <string>@version@</string>
-
-    <key>Java</key>
-    <dict>
-
-        <key>JVMVersion</key>
-        <string>1.4*</string>
-
-        <key>MainClass</key>
-        <string>com.webcodepro.applecommander.ui.AppleCommander</string>
-        
-        <key>ClassPath</key>
-        <string>$JAVAROOT/AppleCommander.jar:$JAVAROOT/swt.jar</string>
-
-        <key>Properties</key>
-        <dict>
-
-            <key>java.library.path</key>
-            <string>$JAVAROOT/</string>
-
-        </dict>
-
-        <key>VMOptions</key>
-        <string>-Xdock:name=AppleCommander</string>
-        
-        <key>StartOnMainThread</key><true/>
-
-    </dict>
-
-    <key>LSHasLocalizedDisplayName</key>
-    <true/>
-
-    <key>NSHumanReadableCopyright</key>
-    <string>Copyright 2002-2008 Rob Greene and John B. Matthews.</string>
-
-</dict>
-</plist>
-