diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 40ac45f833586116bb794d2b24e233a32ff3aafe..2fd69fc030eab47ec7d765f8c6f91af1131e9eeb 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-17  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/security/x509/X509Certificate.java:
+	Explicitely import used classes.
+
 2003-06-17  Michael Koch  <konqueror@gmx.de>
 
 	* java/util/zip/ZipEntry.java,
diff --git a/libjava/gnu/java/security/x509/X509Certificate.java b/libjava/gnu/java/security/x509/X509Certificate.java
index bb66f2e67b6719af65e2dcc7cff51c5fa7bc6394..ca4854ccff141b6b99ff80eeee9339c0a1162155 100644
--- a/libjava/gnu/java/security/x509/X509Certificate.java
+++ b/libjava/gnu/java/security/x509/X509Certificate.java
@@ -41,10 +41,13 @@ package gnu.java.security.x509;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.ObjectStreamException;
 import java.io.Serializable;
 
 import java.math.BigInteger;
 
+import java.net.InetAddress;
+
 import java.security.AlgorithmParameters;
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
@@ -421,7 +424,7 @@ public class X509Certificate extends java.security.cert.X509Certificate
     return subjectKey;
   }
 
-  public Object writeReplace() throws java.io.ObjectStreamException
+  public Object writeReplace() throws ObjectStreamException
   {
     return super.writeReplace();
   }
@@ -469,7 +472,7 @@ public class X509Certificate extends java.security.cert.X509Certificate
                   nameVal = new String((byte[]) name.getValue());
                   break;
                 case IP_ADDRESS:
-                  nameVal = java.net.InetAddress.getByAddress(
+                  nameVal = InetAddress.getByAddress(
                     (byte[]) name.getValue()).getHostAddress();
                   break;
                 case REGISTERED_ID: