diff --git a/build/ACBuild-default.properties b/build/ACBuild-default.properties
index 173afdc..8d7f1b7 100644
--- a/build/ACBuild-default.properties
+++ b/build/ACBuild-default.properties
@@ -6,8 +6,8 @@
 # support files for local builds.
 #
 swtJarPathWin=C:/Program Files/Eclipse 2.1.x/plugins/org.eclipse.swt.win32_2.1.3/ws/win32/swt.jar
-swtJarPathMac=/Users/Shared/eclipse/plugins/org.eclipse.swt.carbon.macosx_3.3.3.v3349.jar
+swtJarPathMac=/Users/Shared/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64_3.106.1.v20170926-0519.jar
 junitPathWin=C:/Java/lib/junit3.8.1/junit.jar
 junitPathMac=/Users/Shared/eclipse/plugins/org.junit_3.8.2.v200706111738/junit.jar
 keyconf=${user.home}/.secret
-alias=name
\ No newline at end of file
+alias=name
diff --git a/build/build.xml b/build/build.xml
index 478a089..3806106 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -13,6 +13,8 @@
 	<property name="web" value="web"/>
 	<property name="javadoc" value="${work}/javadoc"/>
 	<property name="builddir" value="${basedir}/build" />
+	<property name="mac.dir" value="${basedir}/mac"/>
+	<property name="mac.work" value="${work}/mac/AppleCommander-mac" />
 	<property file="${builddir}/ACBuild.properties"/>
 	<property file="${builddir}/ACBuild-default.properties"/>
 	<condition property="swtjar"
@@ -131,38 +133,35 @@
 	</target>
 	
 	<target name="macBundle" depends="init,jars" description="Build Mac application bundle.">
-		<property name="mac.dir" value="mac"/>
 		<property name="mac.app" value="${dist}/AppleCommander.app"/>
+
 		<!--
-		<property name="mac.Contents" value="${mac.app}/Contents"/>
-		<property name="mac.Java" value="${mac.Contents}/Resources/Java"/>
+		     NB: This seems like the only obvious way to turn ${swtjar}
+		     into something we can install using jarbundler to both
+		     copy and add to classpath.  If you have a better way… :)
 		-->
-		<jarbundler dir="${dist}" verbose="true" showPlist="true"
-			name="AppleCommander"
+		<copy file="${swtjar}" todir="${mac.dir}/swt" />
+
+		<mkdir dir="${mac.work}" />
+		<jarbundler dir="${mac.work}"
+			name="AppleCommander" version="${acVersion}"
+			verbose="true" showPlist="true"
 			mainclass="com.webcodepro.applecommander.ui.AppleCommander"
 			bundleid="com.webcodepro.applecommander"
-			jar="${dist}/AppleCommander-${acVersion}.jar"
-			version="${acVersion}" build="${acVersion}"
 			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.6+"
-			/>
+			jvmversion="1.6+" useJavaXKey="true" developmentregion="English"
+			copyright="Copyright 2002-2008 Rob Greene and John B. Matthews.">
+			<jarfilelist dir="${dist}" files="AppleCommander-${acVersion}.jar" />
+			<jarfileset dir="${mac.dir}/swt" />
+		</jarbundler>
 
-		<!--
-		     TODO: Let's not re-enable this.  We can do it better.
-
-		<copy file="${cmdjar}" tofile="${user.home}/bin/ac.jar"/>
-		-->
-		<!--
 	    <zip destfile="${maczip}">
-	        <zipfileset dir="${mac.app}" prefix="AppleCommander.app"/>
-			<zipfileset dir="${mac.app}" prefix="AppleCommander.app"
-				includes="Contents/MacOS/JavaApplicationStub" filemode="755"/>
+			<zipfileset dir="${mac.work}" prefix="AppleCommander-${acVersion}-mac" />
+			<zipfileset dir="${dist}" prefix="AppleCommander-${acVersion}-mac">
+				<include name="AppleCommander-${acVersion}-ac.jar" />
+			</zipfileset>
 	    </zip>
-		-->
 	</target>
 
 	<target name="sourceZip" depends="init" description="Build source ZIP archive">