diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0cd191984ae..aabfaa12941 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-20  Michael Koch  <konqueror@gmx.de>
+
+	* javax/naming/directory/SearchControls.java:
+	Don't explicitely extend java.lang.Object.
+	* javax/naming/spi/DirStateFactory.java:
+	Merged copyright year with GNU classpath.
+
 2004-04-20  Michael Koch  <konqueror@gmx.de>
 
 	* java/nio/channels/Channels.java:
diff --git a/libjava/javax/naming/directory/SearchControls.java b/libjava/javax/naming/directory/SearchControls.java
index 21b97403f65..2b040d91fff 100644
--- a/libjava/javax/naming/directory/SearchControls.java
+++ b/libjava/javax/naming/directory/SearchControls.java
@@ -1,5 +1,5 @@
 /* SearchControls.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,7 @@ import java.io.Serializable;
  * @date June 5, 2001
  */
 
-public class SearchControls extends Object implements Serializable
+public class SearchControls implements Serializable
 {
   public static final int OBJECT_SCOPE = 0;
   public static final int ONELEVEL_SCOPE = 1;
diff --git a/libjava/javax/naming/spi/DirStateFactory.java b/libjava/javax/naming/spi/DirStateFactory.java
index 756a060b02c..67e790d47ad 100644
--- a/libjava/javax/naming/spi/DirStateFactory.java
+++ b/libjava/javax/naming/spi/DirStateFactory.java
@@ -1,5 +1,5 @@
 /* DirStateFactory.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.