diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 52c77620431..9a029bd61df 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-05  Michael Koch  <konqueror@gmx.de>
+
+	* javax/swing/border/Border.java:
+	New version from classpath.
+
 2003-06-05  Michael Koch  <konqueror@gmx.de>
 
 	* javax/swing/border/AbstractBorder.java,
diff --git a/libjava/javax/swing/border/Border.java b/libjava/javax/swing/border/Border.java
index 356693563c0..307dbb6e368 100644
--- a/libjava/javax/swing/border/Border.java
+++ b/libjava/javax/swing/border/Border.java
@@ -35,18 +35,17 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.border;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Insets;
 
 public interface Border
 {
-    public Insets getBorderInsets(Component c);
-    public boolean isBorderOpaque();
-    public void paintBorder(Component c, 
-			    Graphics g, 
-			    int x, 
-			    int y,
-			    int width,
-			    int height);
+  public Insets getBorderInsets (Component c);
+  public boolean isBorderOpaque ();
+  public void paintBorder (Component c, Graphics g, int x, int y,
+                           int width, int height);
 }