diff --git a/ChangeLog b/ChangeLog
index 85d123d02..9c6a2f659 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-17  Matthias Klose  <doko@cs.tu-berlin.de>
+
+        * {,*}/GNUmakefile: Include Version and GNUmakefile.local.
+        * Tools/GNUmakefile.preamble: Set ADDITIONAL_LIB_DIRS.
+
 Thu Dec 17 13:20:00 1998  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* NSWindow.m: Reinstated changes lost in last update (to fix
diff --git a/Images/GNUmakefile b/Images/GNUmakefile
index a6b43689d..82044d458 100644
--- a/Images/GNUmakefile
+++ b/Images/GNUmakefile
@@ -58,6 +58,7 @@ nsmapping.strings
 
 -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/Model/GNUmakefile b/Model/GNUmakefile
index c52063c39..7fc8d2a2c 100644
--- a/Model/GNUmakefile
+++ b/Model/GNUmakefile
@@ -28,6 +28,7 @@ GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
+include ../Version
 LIBRARY_NAME = libgmodel
 
 ifeq ($(GUI_LIB), nx)
diff --git a/Panels/GNUmakefile b/Panels/GNUmakefile
index 1fc647d0d..e70acddd5 100644
--- a/Panels/GNUmakefile
+++ b/Panels/GNUmakefile
@@ -32,6 +32,7 @@ GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
+include ../Version
 prefix = $(GNUSTEP_INSTALLATION_DIR)
 
 PANELS = SavePanel.gmodel
@@ -56,6 +57,7 @@ before-uninstall::
 clean::
 
 -include GNUmakefile.preamble
+-include GNUmakefile.local
 
 include $(GNUSTEP_MAKEFILES)/rules.make
 
diff --git a/Testing/GNUmakefile b/Testing/GNUmakefile
index 322f4b142..debce312f 100644
--- a/Testing/GNUmakefile
+++ b/Testing/GNUmakefile
@@ -35,6 +35,7 @@ GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
+include ../Version
 # The application to be compiled
 TEST_TOOL_NAME = testpb
 
@@ -59,6 +60,7 @@ slider_OBJC_FILES = slider.m
 
 
 -include GNUmakefile.preamble
+-include GNUmakefile.local
 
 include $(GNUSTEP_MAKEFILES)/test-tool.make
 include $(GNUSTEP_MAKEFILES)/test-application.make
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index 822b1c59e..face6e2e3 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -31,6 +31,7 @@ GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
+include ../Version
 # The applications to be compiled
 TOOL_NAME = gpbs make_services set_show_service
 #SERVICE_NAME = example