diff --git a/ChangeLog b/ChangeLog
index d77f6a0..2274ed7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-19  Nicola Pero <nicola.pero@meta-innovation.com>
+
+	* GNUmakefile (GNUSTEP_CORE_SOFTWARE): Do not set.
+	(PACKAGE_NAME): Set before including common.make.
+	
 2008-12-18  Nicola Pero <nicola.pero@meta-innovation.com>
 
 	* GNUmakefile (GNUSTEP_CORE_SOFTWARE): Set to YES.
diff --git a/GNUmakefile b/GNUmakefile
index 1028f68..b001c7a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -31,12 +31,10 @@ ifeq ($(GNUSTEP_MAKEFILES),)
   $(error You need to set GNUSTEP_MAKEFILES before compiling!)
 endif
 
-GNUSTEP_CORE_SOFTWARE = YES
-export GNUSTEP_CORE_SOFTWARE
+PACKAGE_NAME = gnustep-objc
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
-PACKAGE_NAME = gnustep-objc
 VERSION=1.6.0
 SVN_MODULE_NAME = libobjc
 SVN_BASE_URL = svn+ssh://svn.gna.org/svn/gnustep/libs