diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3c57dfa49869..2c6c4e0a816d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-24  Michael Koch  <konqueror@gmx.de>
+
+	* java/awt/Font.java,
+	java/awt/Window.java,
+	java/awt/color/ColorSpace.java,
+	java/awt/datatransfer/StringSelection.java,
+	java/awt/image/ColorModel.java:
+	New versions from classpath.
+
 2003-06-24  Michael Koch  <konqueror@gmx.de>
 
 	* Makefile.am
diff --git a/libjava/java/awt/Font.java b/libjava/java/awt/Font.java
index b762a75dc31b..b887d8ea5eda 100644
--- a/libjava/java/awt/Font.java
+++ b/libjava/java/awt/Font.java
@@ -38,9 +38,9 @@ exception statement from your version. */
 
 package java.awt;
 
-import java.awt.peer.FontPeer;
 import java.awt.font.FontRenderContext;
 import java.awt.font.LineMetrics;
+import java.awt.peer.FontPeer;
 import java.io.Serializable;
 import java.util.StringTokenizer;
 
diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java
index 44946528f77a..2da988507e9a 100644
--- a/libjava/java/awt/Window.java
+++ b/libjava/java/awt/Window.java
@@ -50,7 +50,7 @@ import java.util.ResourceBundle;
 /**
  * This class represents a top-level window with no decorations.
  *
- * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @author Aaron M. Renn <arenn@urbanophile.com>
  * @author Warren Levy  <warrenl@cygnus.com>
  */
 public class Window extends Container
@@ -79,7 +79,7 @@ public class Window extends Container
   Window()
   {
     setVisible(false);
-    setLayout((LayoutManager) new BorderLayout());
+    setLayout(new BorderLayout());
   }
 
   Window(GraphicsConfiguration gc)
diff --git a/libjava/java/awt/color/ColorSpace.java b/libjava/java/awt/color/ColorSpace.java
index 8bf0a8196c0b..905bf9cd7696 100644
--- a/libjava/java/awt/color/ColorSpace.java
+++ b/libjava/java/awt/color/ColorSpace.java
@@ -128,7 +128,7 @@ public abstract class ColorSpace implements Serializable
 
   public boolean isCS_sRGB()
   {
-    return false;
+    return type == CS_sRGB;
   }
 
   /**
diff --git a/libjava/java/awt/datatransfer/StringSelection.java b/libjava/java/awt/datatransfer/StringSelection.java
index f6f0116272be..6db74503bb3d 100644
--- a/libjava/java/awt/datatransfer/StringSelection.java
+++ b/libjava/java/awt/datatransfer/StringSelection.java
@@ -54,8 +54,10 @@ public class StringSelection implements Transferable, ClipboardOwner
  */
 
 // List of flavors we support
-public static final DataFlavor[] supported_flavors 
-   = { DataFlavor.plainTextFlavor };
+// XXX: DataFlavor.plainTextFlavor is deprecated.
+static final DataFlavor[] supported_flavors 
+   = { DataFlavor.stringFlavor,
+       DataFlavor.plainTextFlavor };
 
 /*************************************************************************/
 
diff --git a/libjava/java/awt/image/ColorModel.java b/libjava/java/awt/image/ColorModel.java
index 9976985ab52e..360a7b493236 100644
--- a/libjava/java/awt/image/ColorModel.java
+++ b/libjava/java/awt/image/ColorModel.java
@@ -589,6 +589,11 @@ public abstract class ColorModel implements Transparency
     return sm.getTransferType() == transferType;
   }
 
+  public final int getTransferType ()
+  {
+    return transferType;
+  }
+
   public void finalize()
   {
   }