diff --git a/ChangeLog b/ChangeLog
index f4f891b..ffb719d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-12-18  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* Framework/GNUmakefile.preamble (GMAKE): Take advantage of the
+	MAKE variable, which must already be set to the correct make else
+	we wouldn't be able to compile PC itself, when searching for a
+	working make.  (GMAKE, GDB): Use := to void spawning a subshell
+	every time one of these variables is read.
+
+2008-12-18  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* All GNUmakefiles: added GNUSTEP_CORE_SOFTWARE=YES at the
+	beginning.
+	* GNUmakefile: Export GNUSTEP_CORE_SOFTWARE to reduce chances of a
+	problem if a GNUmakefile in a subdirectory is missing it.
+	
 2008-12-17 Richard frith-Macdonald <rfm"gnu.org>
 
 	Where files are to be entered using NSOpenPanel and a 'set' button,
diff --git a/Framework/GNUmakefile b/Framework/GNUmakefile
index 2d86a19..af1c18a 100644
--- a/Framework/GNUmakefile
+++ b/Framework/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - Generated by ProjectCenter
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Framework/GNUmakefile.preamble b/Framework/GNUmakefile.preamble
index 7d3843f..4b7755e 100644
--- a/Framework/GNUmakefile.preamble
+++ b/Framework/GNUmakefile.preamble
@@ -33,9 +33,10 @@
 #   be put into Makefile.postamble.
 #
 
-# TODO: Make sure if it's portable
-GMAKE = `which gmake`
-GDB = `which gdb`
+# FIXME: Why are we hardcoding the full path to 'make' or 'gdb' in
+# here ?  Can't we discover them at runtime ?
+GMAKE := $(shell which ${MAKE})
+GDB := $(shell which gdb)
 
 #
 # Flags dealing with compiling and linking
diff --git a/GNUmakefile b/GNUmakefile
index 3433893..30ac41b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,6 +9,8 @@ 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
 
 #
diff --git a/Modules/Debuggers/ProjectCenter/GNUmakefile b/Modules/Debuggers/ProjectCenter/GNUmakefile
index 11541f5..f9d6216 100644
--- a/Modules/Debuggers/ProjectCenter/GNUmakefile
+++ b/Modules/Debuggers/ProjectCenter/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ProjectCenter.debugger
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Editors/ProjectCenter/GNUmakefile b/Modules/Editors/ProjectCenter/GNUmakefile
index 52dfdc5..69bed61 100644
--- a/Modules/Editors/ProjectCenter/GNUmakefile
+++ b/Modules/Editors/ProjectCenter/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ProjectCenter.editor
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/GNUmakefile b/Modules/GNUmakefile
index 2946712..25fc009 100644
--- a/Modules/GNUmakefile
+++ b/Modules/GNUmakefile
@@ -17,6 +17,7 @@
 #	- ObjectiveC -- that's it!
 #
 
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Parsers/ProjectCenter/GNUmakefile b/Modules/Parsers/ProjectCenter/GNUmakefile
index d17c039..e6257eb 100644
--- a/Modules/Parsers/ProjectCenter/GNUmakefile
+++ b/Modules/Parsers/ProjectCenter/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ProjectCenter.parser
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Aggregate/GNUmakefile b/Modules/Projects/Aggregate/GNUmakefile
index 9e93016..896156d 100644
--- a/Modules/Projects/Aggregate/GNUmakefile
+++ b/Modules/Projects/Aggregate/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - Aggregate.project
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Application/GNUmakefile b/Modules/Projects/Application/GNUmakefile
index 890c1e8..663d4c6 100644
--- a/Modules/Projects/Application/GNUmakefile
+++ b/Modules/Projects/Application/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ApplicationProject
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Bundle/GNUmakefile b/Modules/Projects/Bundle/GNUmakefile
index 88995a3..379411a 100644
--- a/Modules/Projects/Bundle/GNUmakefile
+++ b/Modules/Projects/Bundle/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - BundleProject
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Framework/GNUmakefile b/Modules/Projects/Framework/GNUmakefile
index d606617..90d0afd 100644
--- a/Modules/Projects/Framework/GNUmakefile
+++ b/Modules/Projects/Framework/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - FrameworkProject
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Library/GNUmakefile b/Modules/Projects/Library/GNUmakefile
index 9396a51..b6231da 100644
--- a/Modules/Projects/Library/GNUmakefile
+++ b/Modules/Projects/Library/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - LibraryProject
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/ResourceSet/GNUmakefile b/Modules/Projects/ResourceSet/GNUmakefile
index 01f6835..dad7083 100644
--- a/Modules/Projects/ResourceSet/GNUmakefile
+++ b/Modules/Projects/ResourceSet/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - Aggregate.project
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #
diff --git a/Modules/Projects/Tool/GNUmakefile b/Modules/Projects/Tool/GNUmakefile
index 75011ca..ca5dad5 100644
--- a/Modules/Projects/Tool/GNUmakefile
+++ b/Modules/Projects/Tool/GNUmakefile
@@ -1,7 +1,7 @@
 #
 # GNUmakefile - ToolProject
 #
-
+GNUSTEP_CORE_SOFTWARE = YES
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #