diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index faa0b979b6a..c9e72fe91a6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-09  Michael Koch  <konqueror@gmx.de>
+
+	* java/lang/System.java
+	(err): Fixed javadoci to point to setErr() and not setOut().
+
 2004-09-09  Jeroen Frijters  <jeroen@frijters.net>
 
 	(normalizePath): Added special case for windows systems.
diff --git a/libjava/java/lang/System.java b/libjava/java/lang/System.java
index a8c0c23c0db..13926b156b5 100644
--- a/libjava/java/lang/System.java
+++ b/libjava/java/lang/System.java
@@ -163,7 +163,7 @@ public final class System
   /**
    * The standard output PrintStream.  This is assigned at startup and
    * starts its life perfectly valid. Although it is marked final, you can
-   * change it using {@link #setOut(PrintStream)} through some hefty VM magic.
+   * change it using {@link #setErr(PrintStream)} through some hefty VM magic.
    *
    * <p>This corresponds to the C stderr and C++ cerr variables, which
    * typically output error messages to the screen, but may be used to pipe