diff --git a/ChangeLog.GNUstep b/ChangeLog.GNUstep
index 593d733..5c90494 100644
--- a/ChangeLog.GNUstep
+++ b/ChangeLog.GNUstep
@@ -1,3 +1,8 @@
+2003-04-04  Adam Fedor  <fedor@gnu.org>
+
+	* GNUmakefile: Use $(GNUSTEP_MAKEFILES) instead of
+	$(GNUSTEP_SYSTEM_ROOT)/Makefiles
+
 2003-03-07  Adam Fedor  <fedor@gnu.org>
 
 	* libobjc.def: Add some symbols
diff --git a/GNUmakefile b/GNUmakefile
index a86ded9..3d164e1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -23,7 +23,7 @@
 #
 # $Id$
 
-include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
+include $(GNUSTEP_MAKEFILES)/common.make
 
 PACKAGE_NAME = gnustep-objc
 VERSION=1.2.3
@@ -162,9 +162,9 @@ ifeq ($(GNUSTEP_MAKE_MAJOR_VERSION),1)
 endif
 
 ifeq ($(USE_LIBRARY_MAKE),yes)
-  include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/library.make
+  include $(GNUSTEP_MAKEFILES)/library.make
 else
-  include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/clibrary.make
+  include $(GNUSTEP_MAKEFILES)/clibrary.make
 endif
 
 -include GNUmakefile.postamble