diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 477d53650090..3d9868ef8e65 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2009-07-27  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR libgcj/40616
+	* java/io/PrintStream.class: Regenerated.
+	* java/io/PrintStream.h: Updated.
+	* java/io/PrintStream.java:
+	(PrintStream(File)): Ported from GNU Classpath
+	version.
+	(PrintStream(File, String)): Likewise.
+	(PrintStream(String)): Likewise.
+	(PrintStream(String, String)): Likewise.
+	
 2009-07-24  Kai Tietz  <kai.tietz@onevision.com>
 
 	* gnu/java/security/jce/prng/natVMSecureRandomWin32.cc: New Win32
diff --git a/libjava/classpath/lib/java/io/PrintStream.class b/libjava/classpath/lib/java/io/PrintStream.class
index c5db701b9df1..78d5cd79aa89 100644
Binary files a/libjava/classpath/lib/java/io/PrintStream.class and b/libjava/classpath/lib/java/io/PrintStream.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class
index 774e33c0dad1..e75c4e09569b 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class differ
diff --git a/libjava/java/io/PrintStream.h b/libjava/java/io/PrintStream.h
index b76912e34eff..6247ba8292c3 100644
--- a/libjava/java/io/PrintStream.h
+++ b/libjava/java/io/PrintStream.h
@@ -29,6 +29,10 @@ class java::io::PrintStream : public ::java::io::FilterOutputStream
 public:
   PrintStream(::java::io::OutputStream *);
   PrintStream(::java::io::OutputStream *, jboolean);
+  PrintStream(::java::io::File *);
+  PrintStream(::java::io::File *, ::java::lang::String *);
+  PrintStream(::java::lang::String *);
+  PrintStream(::java::lang::String *, ::java::lang::String *);
   PrintStream(::java::io::OutputStream *, jboolean, ::java::lang::String *);
   virtual jboolean checkError();
 public: // actually protected
diff --git a/libjava/java/io/PrintStream.java b/libjava/java/io/PrintStream.java
index d3f386dc0838..be28619059a1 100644
--- a/libjava/java/io/PrintStream.java
+++ b/libjava/java/io/PrintStream.java
@@ -122,6 +122,74 @@ public class PrintStream extends FilterOutputStream implements Appendable
     this.auto_flush = auto_flush;
   }
 
+  /**
+   * This method initializes a new <code>PrintStream</code> object to write
+   * to the specified output File. Doesn't autoflush.
+   *
+   * @param file The <code>File</code> to write to.
+   * @throws FileNotFoundException if an error occurs while opening the file.
+   *
+   * @since 1.5
+   */
+  public PrintStream (File file)
+    throws FileNotFoundException
+  {
+    this (new FileOutputStream(file), false);
+  }
+
+  /**
+   * This method initializes a new <code>PrintStream</code> object to write
+   * to the specified output File. Doesn't autoflush.
+   *
+   * @param file The <code>File</code> to write to.
+   * @param encoding The name of the character encoding to use for this
+   * object.
+   * @throws FileNotFoundException If an error occurs while opening the file.
+   * @throws UnsupportedEncodingException If the charset specified by
+   * <code>encoding</code> is invalid.
+   *
+   * @since 1.5
+   */
+  public PrintStream (File file, String encoding)
+    throws FileNotFoundException,UnsupportedEncodingException
+  {
+    this (new FileOutputStream(file), false, encoding);
+  }
+
+  /**
+   * This method initializes a new <code>PrintStream</code> object to write
+   * to the specified output File. Doesn't autoflush.
+   *
+   * @param fileName The name of the <code>File</code> to write to.
+   * @throws FileNotFoundException if an error occurs while opening the file,
+   *
+   * @since 1.5
+   */
+  public PrintStream (String fileName)
+    throws FileNotFoundException
+  {
+    this (new FileOutputStream(new File(fileName)), false);
+  }
+
+  /**
+   * This method initializes a new <code>PrintStream</code> object to write
+   * to the specified output File. Doesn't autoflush.
+   *
+   * @param fileName The name of the <code>File</code> to write to.
+   * @param encoding The name of the character encoding to use for this
+   * object.
+   * @throws FileNotFoundException if an error occurs while opening the file.
+   * @throws UnsupportedEncodingException If the charset specified by
+   * <code>encoding</code> is invalid.
+   *
+   * @since 1.5
+   */
+  public PrintStream (String fileName, String encoding)
+      throws FileNotFoundException,UnsupportedEncodingException
+  {
+    this (new FileOutputStream(new File(fileName)), false, encoding);
+  }
+
   /**
    * This method intializes a new <code>PrintStream</code> object to write
    * to the specified output sink.  This constructor also allows "auto-flush"