diff --git a/eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch b/eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch
new file mode 100644
index 0000000..75c5379
--- /dev/null
+++ b/eclipse-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch
@@ -0,0 +1,22 @@
+Index: src/org/eclipse/pde/internal/core/plugin/PluginHandler.java
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/PluginHandler.java,v
+retrieving revision 1.6
+diff -u -r1.6 PluginHandler.java
+--- src/org/eclipse/pde/internal/core/plugin/PluginHandler.java	3 Apr 2006 19:48:18 -0000	1.6
++++ src/org/eclipse/pde/internal/core/plugin/PluginHandler.java	17 Nov 2006 22:18:53 -0000
+@@ -52,11 +52,13 @@
+ 			}
+ 		}
+ 		
++		boolean setLineAttr = false;
+ 		Element element = fDocument.createElement(qName);
+ 		for (int i = 0; i < attributes.getLength(); i++) {
+ 			element.setAttribute(attributes.getQName(i), attributes.getValue(i));
+-			if ("extension".equals(qName) || "extension-point".equals(qName)) { //$NON-NLS-1$ //$NON-NLS-2$
++			if (("extension".equals(qName) || "extension-point".equals(qName)) && !setLineAttr) { //$NON-NLS-1$ //$NON-NLS-2$
+ 				element.setAttribute("line", Integer.toString(fLocator.getLineNumber())); //$NON-NLS-1$
++				setLineAttr = true;
+ 			}
+ 		}
+ 		
diff --git a/eclipse.spec b/eclipse.spec
index 5e8fa47..9b164c6 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -26,7 +26,7 @@ Epoch:	1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        20%{?dist} 
+Release:        21%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -111,6 +111,9 @@ Patch57:	%{name}-ecj-gcj.patch
 #  sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-swt-firefox.patch
 Patch59:	%{name}-swt-firefox.patch
 Patch60:	%{name}-swt-firefox.2.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=209393
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853
+Patch61:	%{name}-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch
 Patch100:       customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
 # Add ppc64 to the list of arches with gre64.conf
 # part of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=207016
@@ -474,7 +477,12 @@ mv "JNI Generation" JNI_Generation
 %patch60
 mv JNI_Generation "JNI Generation"
 popd
- 
+
+# workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853
+pushd plugins/org.eclipse.pde.core
+%patch61
+popd
+
 # FIXME check if this has been applied upstream
 pushd plugins/org.eclipse.platform.doc.isv
 %patch100 -p0
@@ -1735,6 +1743,10 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Fri Nov 17 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-21
+- Add patch to workaround an xml parsing bug in libgcj (gcc bug #29853).
+- Resolves: #209393.
+
 * Fri Nov 17 2006 Andrew Overholt <overholt@redhat.com> 3.2.1-20
 - Revise gre64 patch to just do ppc64 addition and not ordering change.