Index: gnu/xml/stream/SAXParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/stream/SAXParser.java,v
retrieving revision 1.21
diff -u -r1.21 SAXParser.java
--- gnu/xml/stream/SAXParser.java	7 Jun 2006 08:04:49 -0000	1.21
+++ gnu/xml/stream/SAXParser.java	6 Dec 2006 11:20:01 -0000
@@ -1021,6 +1021,7 @@
         SAXParser parser = new SAXParser(validating, namespaceAware,
                                          xIncludeAware);
         InputSource input = new InputSource(args[pos]);
+        input.setCharacterStream(new java.io.FileReader(args[pos]));
         XMLReader reader = parser.getXMLReader();
         reader.setContentHandler(handler);
         reader.parse(input);
Index: gnu/xml/stream/XMLStreamWriterImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/stream/XMLStreamWriterImpl.java,v
retrieving revision 1.5
diff -u -r1.5 XMLStreamWriterImpl.java
--- gnu/xml/stream/XMLStreamWriterImpl.java	16 Jan 2006 16:23:20 -0000	1.5
+++ gnu/xml/stream/XMLStreamWriterImpl.java	6 Dec 2006 11:20:01 -0000
@@ -664,12 +664,10 @@
   public void writeDTD(String dtd)
     throws XMLStreamException
   {
-    // Really thoroughly pointless method...
     try
       {
-        if (!isName(dtd))
-          throw new IllegalArgumentException("illegal Name: " + dtd);
-
+        // XXX: Should we parse the doctypedecl at this point to ensure
+        // wellformedness?
         writer.write("<!DOCTYPE ");
         writer.write(dtd);
         writer.write('>');