diff --git a/Admin/GNUmakefile b/Admin/GNUmakefile
index b6f4c71ed..5a79dd94e 100644
--- a/Admin/GNUmakefile
+++ b/Admin/GNUmakefile
@@ -41,6 +41,8 @@ DIST_FILES = $(RCS_FILES) $(ADMIN_FILES)
 
 -include Makefile.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/ChangeLog b/ChangeLog
index d9e068801..cf37b9cae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 17 16:12:18 1998  Matthias Klose  <doko@cs.tu-berlin.de>
+
+        * {,*}/GNUmakefile: Include Version and GNUmakefile.in where missing.
+
 Thu Dec 17 14:30:00 1998  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	NSCoder.m: ([-decodePropertyList:]) bugfix - use NSDeserializer
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 995be255c..e1436462e 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -73,7 +73,8 @@ STATUS_TEXI_FILES = version.tmpl.texi
 STATUS_TEXT_MAIN = status.tmpl.texi
 
 -include Makefile.preamble
--include Makefile.local
+
+-include GNUmakefile.local
 
 include $(GNUSTEP_MAKEFILES)/documentation.make
 
diff --git a/Examples/GNUmakefile b/Examples/GNUmakefile
index 6256584e6..00db5323c 100644
--- a/Examples/GNUmakefile
+++ b/Examples/GNUmakefile
@@ -52,6 +52,8 @@ custom-zone.m
 
 -include Makefile.preamble
 
+-include GNUmakefile.local
+
 include $(GNUSTEP_MAKEFILES)/test-tool.make
 
 -include Makefile.postamble
diff --git a/GNUmakefile b/GNUmakefile
index 9d520a6a6..47e01bffe 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -51,6 +51,8 @@ SUBPROJECTS = src Tools doc NSCharacterSets NSTimeZones admin
 
 -include Makefile.preamble
 
+-include GNUmakefile.local
+
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 
 -include Makefile.postamble
diff --git a/NSTimeZones/GNUmakefile b/NSTimeZones/GNUmakefile
index e6ac25c01..fce97ac85 100644
--- a/NSTimeZones/GNUmakefile
+++ b/NSTimeZones/GNUmakefile
@@ -39,6 +39,8 @@ DIST_FILES = GNUmakefile Makefile.postamble $(TIMEZONE_ARCHIVE)
 
 -include Makefile.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/Testing/GNUmakefile b/Testing/GNUmakefile
index 5e87b11d6..7f760d2fb 100644
--- a/Testing/GNUmakefile
+++ b/Testing/GNUmakefile
@@ -168,6 +168,8 @@ DIST_FILES = $(SRCS) $(HDRS) $(DYNAMIC_MFILES) $(DYNAMIC_HFILES) \
 
 -include Makefile.preamble
 
+-include GNUmakefile.local
+
 include $(GNUSTEP_MAKEFILES)/test-tool.make
 include $(GNUSTEP_MAKEFILES)/bundle.make
 
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index 4465c1282..060e9f141 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -27,6 +27,9 @@ GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
+include ../Version
+include ../config.mak
+
 # The application to be compiled
 TOOL_NAME = gdnc defaults dread dwrite dremove
 OBJC_PROGRAM_NAME = gdomap