diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4cb62a87b67..f167739eb20 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -6,6 +6,8 @@
 	(waitFor): Only check thread interrupted status if waitpid() returned
 	an error. Use WIFEXITED and WEXITSTATUS to process process's exit
 	value.
+	
+	* java/security/cert/X509Extension.java: Merge from classpath.
 
 2001-09-22  Anthony Green  <green@redhat.com>
 
diff --git a/libjava/java/security/cert/X509Extension.java b/libjava/java/security/cert/X509Extension.java
index bba72c010aa..593d4a161da 100644
--- a/libjava/java/security/cert/X509Extension.java
+++ b/libjava/java/security/cert/X509Extension.java
@@ -29,7 +29,7 @@ package java.security.cert;
 import java.util.Set;
 
 /**
-	Public abstract interface for the X.509 Extension.
+	Public interface for the X.509 Extension.
 
 	This is used for X.509 v3 Certificates and CRL v2 (Certificate
 	Revocation Lists) for managing attributes assoicated with
@@ -61,7 +61,7 @@ import java.util.Set;
 
 	@since JDK 1.2
 */
-public abstract interface X509Extension
+public interface X509Extension
 {
 
   /**