diff --git a/xerces-j2-build.patch b/xerces-j2-build.patch
index 528bfa3..1b4afe9 100644
--- a/xerces-j2-build.patch
+++ b/xerces-j2-build.patch
@@ -6,7 +6,7 @@
    <!-- enable compilation under IBM JDK 1.4 -->
 -  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
 +  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"
-+           classpath="./tools/xjavac.jar"/>
++           classpath="./tools/bin/xjavac.jar"/>
  
    <!-- Allow properties following these statements to be overridden -->
    <!-- Note that all of these don't have to exist.  They've just been defined
diff --git a/xerces-j2-libgcj.patch b/xerces-j2-libgcj.patch
new file mode 100644
index 0000000..c159df0
--- /dev/null
+++ b/xerces-j2-libgcj.patch
@@ -0,0 +1,17 @@
+Also apply the xjavac classpath hack when running under libgcj.
+
+  http://issues.apache.org/bugzilla/show_bug.cgi?id=34551
+  http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=152255
+
+--- tools/org/apache/xerces/util/XJavac.java~	2005-06-10 10:18:47 +0100
++++ tools/org/apache/xerces/util/XJavac.java	2005-06-10 11:14:35 +0100
+@@ -97,7 +97,8 @@
+             else if( (vendor.indexOf("SUN") >= 0) || 
+                      (vendor.indexOf("BLACKDOWN") >= 0) || 
+                      (vendor.indexOf("APPLE") >= 0) ||
+-                     (vendor.indexOf("HEWLETT-PACKARD") >= 0)) {
++                     (vendor.indexOf("HEWLETT-PACKARD") >= 0) ||
++                     (vendor.indexOf("FREE SOFTWARE FOUNDATION") >= 0)) {
+                 // we're on an SUN 1.4; fiddle with the bootclasspath.
+                 // since we can't eviscerate XML-related info here,
+                 // we must use the classpath
diff --git a/xerces-j2.spec b/xerces-j2.spec
index d6ff9c4..f8670eb 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -17,8 +17,8 @@ Source1:        %{name}-version.sh
 Source2:        %{name}-constants.sh
 Source3:	XJavac.java
 Source4:	xml-commons-external-1.2.01-src.zip
-Patch0:		%{name}-build.patch
-Patch1:		%{name}-bz152255.patch
+Patch0:         %{name}-build.patch
+Patch1:         %{name}-libgcj.patch
 Provides:	jaxp_parser_impl
 Requires:	xml-commons-apis
 Requires:	xml-commons-resolver
@@ -118,15 +118,15 @@ Additional utility scripts for %{name}.
 
 mkdir -p tools/org/apache/xerces/util
 cp -a %{SOURCE3} tools/org/apache/xerces/util
-%patch1 -p0 -b .bz152255
+%patch1 -p0 -b .libgcj
 
 cp -a %{SOURCE4} tools
 
 
 %build
 pushd tools
-find -name '*.java' | xargs javac -cp $(build-classpath ant)
-find -name '*.class' | xargs jar cf xjavac.jar
+javac -cp $(build-classpath ant) org/apache/xerces/util/XJavac.java
+mkdir bin && jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class
 popd
 
 unset CLASSPATH