diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 305ac4f2314..7c1e39103a2 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-27  Tom Tromey  <tromey@redhat.com>
+
+	PR classpath/31303:
+	* external/sax/org/xml/sax/helpers/XMLReaderFactory.java
+	(createXMLReader): Code in Classpath default.
+
 2007-03-27  Keith Seitz  <keiths@redhat.com>
 
 	Merged from upstream:
diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
index 0516ff24e71..304f750b9cc 100644
--- a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
+++ b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
@@ -137,6 +137,11 @@ final public class XMLReaderFactory
 	if (className == null) {
 // BEGIN DISTRIBUTION-SPECIFIC
 
+	    // CLASSPATH LOCAL: have to code in the backup.
+	    // Among other things, see PR 31303, and this thread:
+	    // http://gcc.gnu.org/ml/java-patches/2007-q1/msg00661.html
+	    className = "gnu.xml.stream.SAXParser";
+
 	    // EXAMPLE:
 	    // className = "com.example.sax.XmlReader";
 	    // or a $JAVA_HOME/jre/lib/*properties setting...
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderFactory.class b/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderFactory.class
index 25c986c9b91..9992ef2119d 100644
Binary files a/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderFactory.class and b/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderFactory.class differ