diff --git a/ChangeLog b/ChangeLog
index ecd06e397..7fe3b601f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 12 13:35:25 2004  Nicola Pero  <n.pero@mi.flashnet.it>
+
+	* SSL/GNUmakefile: Set GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES before
+	including common.make so that the local base.make is read
+	correctly.
+
 2004-03-07  Adam Fedor  <fedor@gnu.org>
 
 	* configure.ac: Add HAVE_DLADDR define
diff --git a/SSL/GNUmakefile b/SSL/GNUmakefile
index 596b00a90..cc019855e 100644
--- a/SSL/GNUmakefile
+++ b/SSL/GNUmakefile
@@ -25,6 +25,10 @@
 # Install into the system root by default
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
+# This must set be before reading common.make, which will read the
+# Additional makefiles.
+GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
+
 # Include common.make as the first thing, as this defined
 # FOUNDATION_LIB which is used in ../config.mak
 include $(GNUSTEP_MAKEFILES)/common.make
@@ -32,8 +36,6 @@ include $(GNUSTEP_MAKEFILES)/common.make
 -include ../config.mak
 -include config.mak
 
-GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
-
 srcdir = .
 PACKAGE_NAME = gnustep-base