diff --git a/build/ACBuild-default.properties b/build/ACBuild-default.properties
index 14ecec5..13499f4 100644
--- a/build/ACBuild-default.properties
+++ b/build/ACBuild-default.properties
@@ -9,11 +9,11 @@ antJarPathWin=C:/Java/lib/ant1.10.1/ant.jar
 antJarPathMac=/opt/local/share/java/apache-ant/lib/ant.jar
 antJarPathUnix=/usr/share/java/ant.jar
 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/Java/swt/swt.jar
 swtJarPathUnix=/usr/share/java/swt.jar
 junitPathWin=C:/Java/lib/junit3.8.1/junit.jar
 junitPathMac=/Users/Shared/eclipse/plugins/org.junit_3.8.2.v200706111738/junit.jar
 junitPathUnix=/usr/share/java/junit.jar
 keyconf=${user.home}/.secret
 alias=name
-buildGui=true
+#noGui=true
diff --git a/build/build.xml b/build/build.xml
index 40426ae..337987c 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -71,8 +71,8 @@
 		<property name="antjar" value="${antJarPathMac}" />
 		<property name="swtjar" value="${swtJarPathMac}" />
 		<property name="juintjar" value="${junitPathMac}" />
-		<condition property="buildMacGui" value="true">
-			<istrue value="buildGui" />
+		<condition property="noMacGui" value="true">
+			<isset property="noGui" />
 		</condition>
 	</target>
 
@@ -121,7 +121,7 @@
 		</signjar>
 	</target>
 
-	<target name="executableGuiJar" depends="init" if="buildGui"
+	<target name="executableGuiJar" depends="init" unless="noGui"
 		description="Build GUI executable JAR">
 		<javac srcdir="${source}" destdir="${classes}" classpath="${antjar}:${swtjar}">
 			<include name="**/*.java"/>
@@ -141,9 +141,11 @@
 			</fileset>
 		</jar>
 	</target>
-	
-	<target name="executableCmdJar" depends="init" description="Build command-line only executable JAR">
-		<javac srcdir="${source}" destdir="${classes}" classpath="${antjar}">
+
+	<target name="executableCmdJar" depends="init"
+		description="Build command-line only executable JAR">
+		<!-- SWT needs to be in classpath if executableGuiCmdJar didn't run -->
+		<javac srcdir="${source}" destdir="${classes}" classpath="${antjar}:${swtjar}">
 			<include name="**/*.java"/>
 			<exclude name="**/*Test.java"/>
 			<compilerarg value="-XDignore.symbol.file"/>
@@ -165,8 +167,9 @@
 		</jar>
 	</target>
 
-	<target name="macBundle" depends="init,jars" if="buildMacGui"
+	<target name="macBundle" depends="init,jars" if="isMac" unless="noMacGui"
 		description="Build Mac application bundle.">
+		<echo>${isMac} ${noMacGui}</echo>
 		<property name="mac.dir" value="mac"/>
 		<property name="mac.app" value="${mac.dir}/AppleCommander.app"/>
 		<property name="mac.Contents" value="${mac.app}/Contents"/>