--- cvs-1.11.23/doc/cvs.texinfo
+++ cvs-1.11.23/doc/cvs.texinfo
@@ -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.
--- cvs-1.11.23/doc/cvsclient.texi
+++ cvs-1.11.23/doc/cvsclient.texi
@@ -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