diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 7d3eb99193bc..c28eba0be82b 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,9 @@
+2008-02-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* doc/cp-tools.texinfo (@direntry): Prefix info name with cp-.
+	* doc/cp-hacking.texinfo (@direntry): Likewise.
+	* doc/cp-vmintegration.texinfo (@direntry): Likewise.
+
 2008-02-06  Matthias Klose  <doko@ubuntu.com>
 
 	* tools/Makefile.am ($(TOOLS_ZIP)): Copy over rmic template files.
diff --git a/libjava/classpath/doc/cp-hacking.texinfo b/libjava/classpath/doc/cp-hacking.texinfo
index c79ea5287506..f4beb7e799fb 100644
--- a/libjava/classpath/doc/cp-hacking.texinfo
+++ b/libjava/classpath/doc/cp-hacking.texinfo
@@ -16,7 +16,7 @@ Copyright (C) 1998,1999,2000,2001,2002,2003,2004,2005,2007 Free Software Foundat
 @ifnotplaintext
 @dircategory GNU Libraries
 @direntry
-* Classpath Hacking: (hacking).   GNU Classpath Hacker's Guide
+* Classpath Hacking: (cp-hacking).  GNU Classpath Hacker's Guide
 @end direntry
 @end ifnotplaintext
 @end ifinfo
diff --git a/libjava/classpath/doc/cp-tools.texinfo b/libjava/classpath/doc/cp-tools.texinfo
index 64a9b67d289c..f961bfd87e86 100644
--- a/libjava/classpath/doc/cp-tools.texinfo
+++ b/libjava/classpath/doc/cp-tools.texinfo
@@ -27,7 +27,7 @@ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 @ifnotplaintext
 @dircategory GNU Libraries
 @direntry
-* Classpath Tools: (tools).       GNU Classpath Tools Guide
+* Classpath Tools: (cp-tools).  GNU Classpath Tools Guide
 @end direntry
 @end ifnotplaintext
 @end ifinfo
diff --git a/libjava/classpath/doc/cp-vmintegration.texinfo b/libjava/classpath/doc/cp-vmintegration.texinfo
index 97f381a5ffad..4d54e30f44c9 100644
--- a/libjava/classpath/doc/cp-vmintegration.texinfo
+++ b/libjava/classpath/doc/cp-vmintegration.texinfo
@@ -17,7 +17,7 @@ Copyright (C) 1998-2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @ifnotplaintext
 @dircategory GNU Libraries
 @direntry
-* VM Integration: (vmintegration).   GNU Classpath VM Integration Guide
+* VM Integration: (cp-vmintegration).  GNU Classpath VM Integration Guide
 @end direntry
 @end ifnotplaintext
 @end ifinfo