diff --git a/eclipse-ecj-gcj.patch b/eclipse-ecj-gcj.patch
index 3e17284..79d8949 100644
--- a/eclipse-ecj-gcj.patch
+++ b/eclipse-ecj-gcj.patch
@@ -367,7 +367,7 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
 +						this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
 +				}
 +				this.destinationPath = arg;
-+				this.generatePackagesStructure = true;
++				//this.generatePackagesStructure = true;
 +			} else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
 +				classpath = getArgument(currentArg);
 +			} else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
diff --git a/eclipse.spec b/eclipse.spec
index 6cf32b7..302a110 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -531,7 +531,7 @@ sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gt
                                                       assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
                                                       features/org.eclipse.rcp/build.xml
 
-# remove jdt.compiler.tool as it requires a JVM that supports Java 1.6
+# remove jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
 sed --in-place "s/org.eclipse.jdt.compiler.tool:0.0.0,1.0.0.v_763,//" features/org.eclipse.jdt/build.xml
 linenum=$(grep -no jdt.compiler.tool features/org.eclipse.jdt/build.xml | cut -d : -f 1)
 sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
@@ -541,6 +541,17 @@ linenum=$(grep -no "dir=\"plugins/org.eclipse.jdt.compiler.tool" assemble.org.ec
 sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
 linenum=$(grep -no "value=\"org.eclipse.jdt.compiler.tool" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
 sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+# --
+sed --in-place "s/org.eclipse.jdt.compiler.apt:0.0.0,1.0.0.v20070510-2000,//" features/org.eclipse.jdt/build.xml
+linenum=$(grep -no jdt.compiler.apt features/org.eclipse.jdt/build.xml | cut -d : -f 1)
+sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
+linenum=$(grep -no jdt.compiler.apt features/org.eclipse.jdt/feature.xml | cut -d : -f 1)
+sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml
+linenum=$(grep -no "dir=\"plugins/org.eclipse.jdt.compiler.apt" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
+sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+linenum=$(grep -no "value=\"org.eclipse.jdt.compiler.apt" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
+sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+
 
 # link to the jsch jar
 rm plugins/com.jcraft.jsch_0.1.28.jar