diff --git a/ChangeLog b/ChangeLog
index cfb341382..3453719f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,28 @@
 2010-02-11  Nicola Pero  <nicola.pero@meta-innovation.com>
 
-	* Source/GNUmakefile: Do not try including non-existing
+	* Source/GNUmakefile: Do not try including the non-existing
 	GNUmakefile.local file.
+	* ColorPickers/GNUmakefile: Same change.
+	* Documentation/GNUmakefile: Same change.
+	* Model/GNUmakefile: Same change.
+	* Panels/GNUmakefile: Same change.
+	* PrinterTypes/GNUmakefile: Same change.
+	* Tools/GNUmakefile: Same change, plus do not try including the
+	non-existing GNUmakefile.local.service file either.
 
+	* Model/GNUmakefile.postamble (after-distclean): Do not remove the
+	non-existing GNUmakefile.local file.
+	* Source/GNUmakefile.postamble (after-distclean): Same change.
+	* Tools/GNUmakefile.postamble (after-distclean): Do not remove the
+	non-existing GNUmakefile.local and GNUmakefile.local.service
+	files.
+	
+	* Documentation/GNUmakefile: Do not include aggregate.make twice.
+	* KeyBindings/GNUmakefile (after-uninstall): Remove the
+	$(GNUSTEP_LIBRARY)/KeyBindings directory if empty.
+	* Model/GNUmakefile: Do not include library.make when GUI_LIB =
+	gnu.
+	
 2010-02-11 Riccardo Mottola <rmottola@users.sf.net>
 
 	* Source/NSWindow.m: revert accidental commit
diff --git a/ColorPickers/GNUmakefile b/ColorPickers/GNUmakefile
index 1ace924b7..31e2ab104 100644
--- a/ColorPickers/GNUmakefile
+++ b/ColorPickers/GNUmakefile
@@ -66,8 +66,6 @@ WheelPicker_RESOURCE_FILES = GSWheelColorPicker.tiff
 
 -include GNUmakefile.preamble
 
--include GNUmakefile.local
-
 include $(GNUSTEP_MAKEFILES)/bundle.make
 
 -include GNUmakefile.postamble
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index af1420d18..e115a174d 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -81,9 +81,6 @@ GuiAdditions_DOC_INSTALL_DIR = Developer/Gui/Additions
 
 -include GNUmakefile.preamble
 
--include GNUmakefile.local
-
-include $(GNUSTEP_MAKEFILES)/aggregate.make
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 include $(GNUSTEP_MAKEFILES)/documentation.make
 
diff --git a/KeyBindings/GNUmakefile b/KeyBindings/GNUmakefile
index a0ba0cfba..1ebc7b6d7 100644
--- a/KeyBindings/GNUmakefile
+++ b/KeyBindings/GNUmakefile
@@ -34,3 +34,4 @@ after-install:: $(GNUSTEP_LIBRARY)/KeyBindings
 
 after-uninstall::
 	rm -f $(GNUSTEP_LIBRARY)/KeyBindings/DefaultKeyBindings.dict
+	-rmdir $(GNUSTEP_LIBRARY)/KeyBindings
diff --git a/Model/GNUmakefile b/Model/GNUmakefile
index 4f0a3ba7a..3d9014c35 100644
--- a/Model/GNUmakefile
+++ b/Model/GNUmakefile
@@ -85,12 +85,11 @@ libgmodel_BUNDLE_LIBS += $(libgmodel_LIBRARIES_DEPEND_UPON)
 nib2gmodel_LIBRARIES_DEPEND_UPON = $(BACKEND_LIBS) $(GUI_LIBS) \
 	$(FND_LIBS) $(SYSTEM_LIBS)
 
--include GNUmakefile.local
-
 ifeq ($(GUI_LIB), gnu)
   include $(GNUSTEP_MAKEFILES)/bundle.make
+else
+  include $(GNUSTEP_MAKEFILES)/library.make
 endif
-include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 include $(GNUSTEP_MAKEFILES)/application.make
 
diff --git a/Model/GNUmakefile.postamble b/Model/GNUmakefile.postamble
index 19017b661..72b428c78 100644
--- a/Model/GNUmakefile.postamble
+++ b/Model/GNUmakefile.postamble
@@ -32,5 +32,3 @@ before-libgmodel-all:: \
 # Additional dependencies
 $(GNUSTEP_OBJ_DIR)/GMArchiver.o: GMArchiveObjects.m
 
-after-distclean::
-	rm -f GNUmakefile.local
diff --git a/Panels/GNUmakefile b/Panels/GNUmakefile
index f07062c6f..d711c8375 100644
--- a/Panels/GNUmakefile
+++ b/Panels/GNUmakefile
@@ -33,11 +33,10 @@ LOCALIZED_RESOURCE_COMPONENTS = \
   GSDataLinkPanel.gorm \
   GSPageLayout.gorm \
   GSPrintPanel.gorm \
-	GSToolbarCustomizationPalette.gorm \
+  GSToolbarCustomizationPalette.gorm \
   GSSpellPanel.gorm
 
 -include GNUmakefile.preamble
--include GNUmakefile.local
 
 include $(GNUSTEP_MAKEFILES)/rules.make
 
diff --git a/PrinterTypes/GNUmakefile b/PrinterTypes/GNUmakefile
index 41c380987..93c4438cc 100644
--- a/PrinterTypes/GNUmakefile
+++ b/PrinterTypes/GNUmakefile
@@ -38,7 +38,6 @@ RESOURCE_FILES = GSProlog.ps
 
 -include GNUmakefile.preamble
 
--include GNUmakefile.local
 # We don't actually build anything in this directory so
 # just include the common makefile rules
 include $(GNUSTEP_MAKEFILES)/rules.make
diff --git a/Source/GNUmakefile.postamble b/Source/GNUmakefile.postamble
index 8763b649b..135a4d37a 100644
--- a/Source/GNUmakefile.postamble
+++ b/Source/GNUmakefile.postamble
@@ -88,7 +88,6 @@ after-clean::
 
 # Things to do after distcleaning
 after-distclean::
-	rm -f GNUmakefile.local 
 	rm -rf $(GNUSTEP_TARGET_DIR)/config.h
 	rm -rf ../Headers/Additions/GNUstepGUI/config.h
 
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index ab1bebad7..f7918d59c 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -47,8 +47,6 @@ GSspell_OBJC_FILES = GSspell.m
 
 include GNUmakefile.preamble
 
--include GNUmakefile.local
-
 ifeq ($(CROSS_COMPILING),yes)
   GNUSTEP_MAKE_SERVICES=:
 else
@@ -59,5 +57,4 @@ include $(GNUSTEP_MAKEFILES)/tool.make
 include $(GNUSTEP_MAKEFILES)/service.make
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 
--include GNUmakefile.local.service
 include GNUmakefile.postamble
diff --git a/Tools/GNUmakefile.postamble b/Tools/GNUmakefile.postamble
index 53c97fb0b..80e2ec51d 100644
--- a/Tools/GNUmakefile.postamble
+++ b/Tools/GNUmakefile.postamble
@@ -38,9 +38,7 @@
 # before-distclean::
 
 # Things to do after distcleaning
-after-distclean::
-	rm -f GNUmakefile.local
-	rm -f GNUmakefile.local.service
+# after-distclean::
 
 # Things to do before checking
 # before-check::