Index: nbbuild/antsrc/org/netbeans/nbbuild/MakeLNBM.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/MakeLNBM.java,v
retrieving revision 1.3
diff -u -r1.3 MakeLNBM.java
--- nbbuild/antsrc/org/netbeans/nbbuild/MakeLNBM.java	13 Mar 2003 18:14:30 -0000	1.3
+++ nbbuild/antsrc/org/netbeans/nbbuild/MakeLNBM.java	27 Mar 2003 19:34:48 -0000
@@ -59,7 +59,7 @@
 		try {
 		    InputStream is = new FileInputStream (file);
 		    try {
-			Reader r = new InputStreamReader (is);
+			Reader r = new InputStreamReader (is, "UTF-8");
 			char[] buf = new char[4096];
 			int len;
 			while ((len = r.read (buf)) != -1)
Index: nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java,v
retrieving revision 1.39
diff -u -r1.39 MakeNBM.java
--- nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java	13 Mar 2003 18:14:30 -0000	1.39
+++ nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java	27 Mar 2003 19:34:48 -0000
@@ -56,7 +56,7 @@
 		try {
 		    InputStream is = new FileInputStream (file);
 		    try {
-			Reader r = new InputStreamReader (is);
+			Reader r = new InputStreamReader (is, "UTF-8");
 			char[] buf = new char[4096];
 			int len;
 			while ((len = r.read (buf)) != -1)
Index: nbbuild/antsrc/org/netbeans/nbbuild/MakeUpdateDesc.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/MakeUpdateDesc.java,v
retrieving revision 1.13
diff -u -r1.13 MakeUpdateDesc.java
--- nbbuild/antsrc/org/netbeans/nbbuild/MakeUpdateDesc.java	13 Mar 2003 19:32:15 -0000	1.13
+++ nbbuild/antsrc/org/netbeans/nbbuild/MakeUpdateDesc.java	27 Mar 2003 19:34:48 -0000
@@ -171,7 +171,7 @@
                     }
                     desc_ent = new File(ent_name);               
                     desc_ent.delete();
-                    pw.println ("<!DOCTYPE autoupdate_catalog PUBLIC \"-//NetBeans//DTD Autoupdate Catalog 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-catalog-2_0.dtd\" [");
+                    pw.println ("<!DOCTYPE module_updates PUBLIC \"-//NetBeans//DTD Autoupdate Catalog 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-catalog-2_0.dtd\" [");
                     // Would be better to follow order of groups and includes
                     pw.println ("    <!ENTITY entity SYSTEM \"" + xmlEscape(desc_ent.getName()) + "\">");
                     int inc_num=0;
@@ -195,7 +195,7 @@
                     pw.println ("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
                     
                 } else {
-                    pw.println ("<!DOCTYPE module_updates PUBLIC \"-//NetBeans//DTD Autoupdate Module Info 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-info-2_0.dtd\">");
+                    pw.println ("<!DOCTYPE module_updates PUBLIC \"-//NetBeans//DTD Autoupdate Catalog 2.0//EN\" \"http://www.netbeans.org/dtds/autoupdate-catalog-2_0.dtd\">");
                     pw.println ("<module_updates timestamp=\"" + date + "\">");
                     pw.println ();
                 }
@@ -234,7 +234,7 @@
                                         throw new BuildException ("NBM " + n_file + " was malformed: no Info/info.xml", location);
                                     java.io.InputStream is = zip.getInputStream (entry);
                                     try {
-                                        java.io.BufferedReader r = new java.io.BufferedReader (new java.io.InputStreamReader (is));
+                                        java.io.BufferedReader r = new java.io.BufferedReader (new java.io.InputStreamReader (is, "UTF-8"));
                                         String line = r.readLine ();
                                         if (! line.startsWith ("<?xml"))
                                             throw new BuildException ("Strange info.xml line: " + line, location);