diff --git a/ChangeLog b/ChangeLog
index ffb719d..115ab2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-19  Nicola Pero <nicola.pero@meta-innovation.com>
+
+	* All GNUmakefiles: removed GNUSTEP_CORE_SOFTWARE=YES and
+	added PACKAGE_NAME=ProjectCenter.
+	* GNUmakefile: Export PACKAGE_NAME to reduce chances of a problem
+	if a GNUmakefile in a subdirectory is missing it.
+	
 2008-12-18  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* Framework/GNUmakefile.preamble (GMAKE): Take advantage of the
diff --git a/Framework/GNUmakefile b/Framework/GNUmakefile
index af1c18a..c4cef63 100644
--- a/Framework/GNUmakefile
+++ b/Framework/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - Generated by ProjectCenter
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/GNUmakefile b/GNUmakefile
index 30ac41b..75e030f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,15 +9,14 @@ ifeq ($(GNUSTEP_MAKEFILES),)
   $(error You need to set GNUSTEP_MAKEFILES before compiling!)
 endif
 
-GNUSTEP_CORE_SOFTWARE = YES
-export GNUSTEP_CORE_SOFTWARE
+PACKAGE_NAME = ProjectCenter
+export PACKAGE_NAME
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
 # Main application
 #
 VERSION = 0.5.0
-PACKAGE_NAME = ProjectCenter
 APP_NAME = ProjectCenter
 ProjectCenter_APPLICATION_ICON = Images/ProjectCenter.tiff
 
diff --git a/Modules/Debuggers/ProjectCenter/GNUmakefile b/Modules/Debuggers/ProjectCenter/GNUmakefile
index f9d6216..a31b4f4 100644
--- a/Modules/Debuggers/ProjectCenter/GNUmakefile
+++ b/Modules/Debuggers/ProjectCenter/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ProjectCenter.debugger
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Editors/ProjectCenter/GNUmakefile b/Modules/Editors/ProjectCenter/GNUmakefile
index 69bed61..041209f 100644
--- a/Modules/Editors/ProjectCenter/GNUmakefile
+++ b/Modules/Editors/ProjectCenter/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ProjectCenter.editor
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/GNUmakefile b/Modules/GNUmakefile
index 25fc009..594f28b 100644
--- a/Modules/GNUmakefile
+++ b/Modules/GNUmakefile
@@ -17,7 +17,7 @@
 #	- ObjectiveC -- that's it!
 #
 
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Parsers/ProjectCenter/GNUmakefile b/Modules/Parsers/ProjectCenter/GNUmakefile
index e6257eb..525e858 100644
--- a/Modules/Parsers/ProjectCenter/GNUmakefile
+++ b/Modules/Parsers/ProjectCenter/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ProjectCenter.parser
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Aggregate/GNUmakefile b/Modules/Projects/Aggregate/GNUmakefile
index 896156d..30df49d 100644
--- a/Modules/Projects/Aggregate/GNUmakefile
+++ b/Modules/Projects/Aggregate/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - Aggregate.project
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Application/GNUmakefile b/Modules/Projects/Application/GNUmakefile
index 663d4c6..17e627d 100644
--- a/Modules/Projects/Application/GNUmakefile
+++ b/Modules/Projects/Application/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ApplicationProject
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Bundle/GNUmakefile b/Modules/Projects/Bundle/GNUmakefile
index 379411a..5aabbfc 100644
--- a/Modules/Projects/Bundle/GNUmakefile
+++ b/Modules/Projects/Bundle/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - BundleProject
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Framework/GNUmakefile b/Modules/Projects/Framework/GNUmakefile
index 90d0afd..3282df2 100644
--- a/Modules/Projects/Framework/GNUmakefile
+++ b/Modules/Projects/Framework/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - FrameworkProject
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Library/GNUmakefile b/Modules/Projects/Library/GNUmakefile
index b6231da..09f3d46 100644
--- a/Modules/Projects/Library/GNUmakefile
+++ b/Modules/Projects/Library/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - LibraryProject
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/ResourceSet/GNUmakefile b/Modules/Projects/ResourceSet/GNUmakefile
index dad7083..a90f919 100644
--- a/Modules/Projects/ResourceSet/GNUmakefile
+++ b/Modules/Projects/ResourceSet/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - Aggregate.project
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Tool/GNUmakefile b/Modules/Projects/Tool/GNUmakefile
index ca5dad5..429fa6e 100644
--- a/Modules/Projects/Tool/GNUmakefile
+++ b/Modules/Projects/Tool/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ToolProject
 #
-GNUSTEP_CORE_SOFTWARE = YES
+PACKAGE_NAME = ProjectCenter
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #