diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e41bf609f2a..03a108fcdff 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-16  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/nio/charset/UTF_16Encoder.java
+	(UTF_16Encoder): Fixed maxBytesPerChar handling.
+
 2004-10-16  Michael Koch  <konqueror@gmx.de>
 
 	* java/math/BigDecimal.java, java/math/BigInteger.java:
diff --git a/libjava/gnu/java/nio/charset/UTF_16Encoder.java b/libjava/gnu/java/nio/charset/UTF_16Encoder.java
index b0cb9ed8ce1..8026e027bec 100644
--- a/libjava/gnu/java/nio/charset/UTF_16Encoder.java
+++ b/libjava/gnu/java/nio/charset/UTF_16Encoder.java
@@ -63,7 +63,7 @@ final class UTF_16Encoder extends CharsetEncoder
   UTF_16Encoder (Charset cs, int byteOrder, boolean useByteOrderMark)
   {
     super (cs, 2.0f,
-           useByteOrderMark ? 4.0f : 2.0f,
+           useByteOrderMark ? 2.0f : 4.0f,
            byteOrder == BIG_ENDIAN
              ? new byte[] { (byte) 0xFF, (byte) 0xFD }
              : new byte[] { (byte) 0xFD, (byte) 0xFF });