diff --git a/ChangeLog b/ChangeLog
index c2bb7bd..d77f6a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-18  Nicola Pero <nicola.pero@meta-innovation.com>
+
+	* GNUmakefile (GNUSTEP_CORE_SOFTWARE): Set to YES.
+	(GNUSTEP_INSTALLATION_DOMAIN): Do not set to SYSTEM.
+	
 2008-11-07  Roland Schwingel <roland.schwingel@onevision.de>
 
 	* sendmsg.c:
diff --git a/GNUmakefile b/GNUmakefile
index d3b3e4b..1028f68 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -31,6 +31,9 @@ ifeq ($(GNUSTEP_MAKEFILES),)
   $(error You need to set GNUSTEP_MAKEFILES before compiling!)
 endif
 
+GNUSTEP_CORE_SOFTWARE = YES
+export GNUSTEP_CORE_SOFTWARE
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 PACKAGE_NAME = gnustep-objc
@@ -39,11 +42,6 @@ SVN_MODULE_NAME = libobjc
 SVN_BASE_URL = svn+ssh://svn.gna.org/svn/gnustep/libs
 SVN_TAG_NAME=objc
 
-# FIXME - remove this, but when we remove it, also update
-# gnustep-make's configure.ac script to check in GNUSTEP_LOCAL_ROOT
-# too!  Else this wouldn't be found.
-GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
-
 CLIBRARY_NAME = libobjc
 
 # dce, decosf1, irix, mach, os2, posix, pthreads, single, solaris, vxworks