diff -upk.orig cvs-1.11.20.orig/doc/cvs.texinfo cvs-1.11.20/doc/cvs.texinfo
--- cvs-1.11.20.orig/doc/cvs.texinfo	2005-04-14 17:38:46 +0000
+++ cvs-1.11.20/doc/cvs.texinfo	2005-09-28 22:38:22 +0000
@@ -97,13 +97,10 @@ approved by the Free Software Foundation
 @end macro
 @end ifhtml
 
-@dircategory GNU Packages
+@dircategory Development/Other
 @direntry
-* CVS: (cvs).                   Concurrent Versions System
-@end direntry
-@dircategory Individual utilities
-@direntry
-* cvs: (cvs)CVS commands.       Concurrent Versions System
+* CVS: (cvs).                                   Concurrent Versions System
+* cvs: (cvs)CVS commands.                       Concurrent Versions System
 @end direntry
 
 @comment The titlepage section does not appear in the Info file.
diff -upk.orig cvs-1.11.20.orig/doc/cvsclient.texi cvs-1.11.20/doc/cvsclient.texi
--- cvs-1.11.20.orig/doc/cvsclient.texi	2004-11-11 22:30:41 +0000
+++ cvs-1.11.20/doc/cvsclient.texi	2005-09-28 22:38:22 +0000
@@ -3,9 +3,9 @@
 @setfilename cvsclient.info
 @include version-client.texi
 
-@dircategory Programming
+@dircategory Development/Other
 @direntry
-* cvsclient: (cvsclient).      The CVS client/server protocol.
+* CVS client/server: (cvsclient).               Describes the client/server protocol used by CVS.
 @end direntry
 
 @node Top