diff --git a/buildScripts/deps/eclipse-debug-target.template b/buildScripts/deps/eclipse-debug-target.template
index 99e4237c..7a1ac635 100644
--- a/buildScripts/deps/eclipse-debug-target.template
+++ b/buildScripts/deps/eclipse-debug-target.template
@@ -21,7 +21,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m @START_ON_FIRST_THREAD@ -Dorg.eclipse.swt.internal.carbon.smallFonts -javaagent:${project_loc:lombok}/dist/lombok.jar -Xbootclasspath/a:${project_loc:lombok}/dist/lombok.jar -Dlombok.patcher.patchDebugDir=${project_loc:lombok}/debug/patchedClasses"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m @D32@ @START_ON_FIRST_THREAD@ -Dorg.eclipse.swt.internal.carbon.smallFonts -javaagent:${project_loc:lombok}/dist/lombok.jar -Xbootclasspath/a:${project_loc:lombok}/dist/lombok.jar -Dlombok.patcher.patchDebugDir=${project_loc:lombok}/debug/patchedClasses"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <booleanAttribute key="show_selected_only" value="false"/>
diff --git a/buildScripts/deps/eclipse-debugging.ant.xml b/buildScripts/deps/eclipse-debugging.ant.xml
index 343a183d..dddd7f6a 100644
--- a/buildScripts/deps/eclipse-debugging.ant.xml
+++ b/buildScripts/deps/eclipse-debugging.ant.xml
@@ -227,7 +227,10 @@ WARNING: This project is enormous (350MB) and takes like an hour to check out. Y
 		<condition property="startOnFirstThread" value="-XstartOnFirstThread">
 			<os family="mac" />
 		</condition>
-		<condition property="startOnFirstThread" value="">
+		<condition property="d32" value="-d32">
+			<os family="mac" />
+		</condition>
+		<condition property="d32" value="">
 			<not><os family="mac" /></not>
 		</condition>
 	</target>
@@ -240,6 +243,7 @@ WARNING: This project is enormous (350MB) and takes like an hour to check out. Y
 				overwrite="true">
 			<filterset>
 				<filter token="START_ON_FIRST_THREAD" value="${startOnFirstThread}" />
+				<filter token="D32" value="${d32}" />
 			</filterset>
 		</copy>
 	</target>