diff --git a/ChangeLog b/ChangeLog
index 49055137a..d8d686f6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-04-12  Adam Fedor  <fedor@gnu.org>
 
+	* Documentation/coding-standards.texi: Add info section
+	* Documentation/manual/manual.texi: Likewise (patch from
+	Marco Bardelli).
+	* gnustep-base-debug.spec.in: Remove
+
 	* gnustep-base.spec.in, Documentation/install.texi: Document
 	that gnustep-make 2.0.0 is required.
 
diff --git a/Documentation/coding-standards.texi b/Documentation/coding-standards.texi
index cc8a62bb9..366aa959f 100644
--- a/Documentation/coding-standards.texi
+++ b/Documentation/coding-standards.texi
@@ -4,7 +4,10 @@
 
 @ifinfo
 @format
-* Coding: (coding).           Coding Standards for GNUstep Libraries
+INFO-DIR-SECTION GNUstep
+START-INFO-DIR-ENTRY
+* Coding: (coding-standards).           Coding Standards for GNUstep Libraries
+END-INFO-DIR-ENTRY
 @end format
 @end ifinfo
 
diff --git a/Documentation/manual/manual.texi b/Documentation/manual/manual.texi
index 9188aeff0..7d1e93034 100644
--- a/Documentation/manual/manual.texi
+++ b/Documentation/manual/manual.texi
@@ -7,8 +7,9 @@
 
 @ifinfo
 @format
+INFO-DIR-SECTION GNUstep
 START-INFO-DIR-ENTRY
-* GNUstepBase:         Objective C Language and GNUstep Base Library
+* GNUstepBase: (manual).        Objective C Language and GNUstep Base Library
 END-INFO-DIR-ENTRY
 @end format
 @end ifinfo
@@ -88,6 +89,7 @@ into another language, under the above conditions for modified versions.
 * Objective-C Java and C++:: Comparison between Objective-C, Java, and C++
 * Java and Guile::       Programming GNUstep in Java and Guile
 * Compliance to Standards:: GNUstep and the OpenStep and Mac OS X APIs
+* Make::                 Using the Package to build GNUstep "Objects"
 @end menu
 @c **end Top node and master menu
 @end ifinfo
@@ -133,6 +135,8 @@ into another language, under the above conditions for modified versions.
 @c Appendix E: GNUstep Compliance to Standards
 @include Compliance.texi
 
+@c Appendix F: Using the GNUstep Make Package
+@include GNUstepMake.texi
 
 @unnumbered Concept Index
 @printindex cp
diff --git a/gnustep-base-debug.spec.in b/gnustep-base-debug.spec.in
deleted file mode 100644
index 6cf937168..000000000
--- a/gnustep-base-debug.spec.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Release: 	1
-Source: 	ftp://ftp.gnustep.org/pub/gnustep/core/%{gs_name}-%{gs_version}.tar.gz
-Copyright: 	GPL
-Group: 		Development/Libraries
-Summary: 	GNUstep Base library package - debugging version
-Packager:	Adam Fedor <fedor@gnu.org>
-Vendor:		The GNUstep Project
-URL:		http://www.gnustep.org/
-Requires:	gnustep-make >= 0.9.0
-
-%description 
-This package contains the debuggable version of the GNUstep Base
-Library.  You probably only need it if you want to compile debuggable
-GNUstep programs.