diff --git a/ChangeLog b/ChangeLog
index aa44e5d..e01b5a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-11-15  Nicola Pero  <nicola@nicola-laptop>
+
+	* Modules/GNUmakefile.bundles (BUNDLE_INSTALL_DIR): Install the
+	bundles in GNUSTEP_INSTALLATION_DIR, not in GNUSTEP_SYSTEM_ROOT.
+	* Modules/ApplicationProject/PCAppProject.m ([PCAppProject
+	-appendHead:]): Do not hardcode GNUSTEP_INSTALLATION_DIR in
+	GNUmakefiles.  See comments in the file for an explanation of how
+	to improve PC's installation controls.
+	* Modules/RenaissanceProject/PCRenaissanceProject.m
+	([PCRenaissanceProject -appendHead:]): Same change.
+	* Modules/ToolProject/PCToolProject.m ([PCToolProject
+	-appendHead:]): Same change.
+	* Modules/BundleProject/Resources/PC.project (INSTALLDIR): Install
+	bundles by default in $(GNUSTEP_BUNDLES).	
+
 2006-10-21 15:41-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Resources/ProjectCenter.gorm: Corrected issue with dangling menu/
diff --git a/Modules/ApplicationProject/PCAppProject.m b/Modules/ApplicationProject/PCAppProject.m
index a1458e4..512f93e 100644
--- a/Modules/ApplicationProject/PCAppProject.m
+++ b/Modules/ApplicationProject/PCAppProject.m
@@ -503,9 +503,21 @@
     }
   else
     {
+      /* FIXME - we should never hardcode installation information in
+       * GNUmakefiles.  Presumably you may want to pass this
+       * information to make on the command line though!  It shouldn't
+       * be hardcoded in the makefile though.  If we add the
+       * functionality of passing it on the command-line, it should be
+       * passed as in make GNUSTEP_INSTALLATION_DOMAIN=SYSTEM rather
+       * than GNUSTEP_INSTALLATION_DIR.  So we should also have the
+       * user select an installation domain rather than an actual
+       * directory (that would be pretty cool). -- Nicola
+       */
+      /*
       [mff appendString: 
 	[NSString stringWithFormat: @"GNUSTEP_INSTALLATION_DIR = %@\n",
         installDir]];
+      */
     }
 }
 
diff --git a/Modules/BundleProject/Resources/PC.project b/Modules/BundleProject/Resources/PC.project
index 48953db..ef9908b 100644
--- a/Modules/BundleProject/Resources/PC.project
+++ b/Modules/BundleProject/Resources/PC.project
@@ -16,7 +16,7 @@
     LIBRARIES = ("gnustep-base","gnustep-gui");
     LOCALIZED_RESOURCES = ();
     MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)";
-    INSTALLDIR = "$(HOME)/GNUstep/Library/Bundles";
+    INSTALLDIR = "$(GNUSTEP_BUNDLES)";
     OBJC_COMPILEROPTIONS = "";
     OTHER_RESOURCES = ();
     OTHER_SOURCES = ();
diff --git a/Modules/GNUmakefile.bundles b/Modules/GNUmakefile.bundles
index dbc174e..abeafd5 100644
--- a/Modules/GNUmakefile.bundles
+++ b/Modules/GNUmakefile.bundles
@@ -20,5 +20,5 @@ ifeq ($(DO_LIB_LINK), yes)
 endif
 
 BUNDLE_EXTENSION = .bundle
-BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Applications/ProjectCenter.app/Resources
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Applications/ProjectCenter.app/Resources
 $(PACKAGE_NAME)_STANDARD_INSTALL = no
diff --git a/Modules/RenaissanceProject/PCRenaissanceProject.m b/Modules/RenaissanceProject/PCRenaissanceProject.m
index 0a554be..8a59d8e 100644
--- a/Modules/RenaissanceProject/PCRenaissanceProject.m
+++ b/Modules/RenaissanceProject/PCRenaissanceProject.m
@@ -502,9 +502,21 @@
     }
   else
     {
+      /* FIXME - we should never hardcode installation information in
+       * GNUmakefiles.  Presumably you may want to pass this
+       * information to make on the command line though!  It shouldn't
+       * be hardcoded in the makefile though.  If we add the
+       * functionality of passing it on the command-line, it should be
+       * passed as in make GNUSTEP_INSTALLATION_DOMAIN=SYSTEM rather
+       * than GNUSTEP_INSTALLATION_DIR.  So we should also have the
+       * user select an installation domain rather than an actual
+       * directory (that would be pretty cool). -- Nicola
+       */
+      /*
       [mff appendString: 
 	[NSString stringWithFormat: @"GNUSTEP_INSTALLATION_DIR = %@\n",
         installDir]];
+      */
     }
 }
 
diff --git a/Modules/ToolProject/PCToolProject.m b/Modules/ToolProject/PCToolProject.m
index 4f9865a..a004cdc 100644
--- a/Modules/ToolProject/PCToolProject.m
+++ b/Modules/ToolProject/PCToolProject.m
@@ -304,9 +304,21 @@
     }
   else
     {
-      [mff appendString:
-	[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR = %@\n",
+      /* FIXME - we should never hardcode installation information in
+       * GNUmakefiles.  Presumably you may want to pass this
+       * information to make on the command line though!  It shouldn't
+       * be hardcoded in the makefile though.  If we add the
+       * functionality of passing it on the command-line, it should be
+       * passed as in make GNUSTEP_INSTALLATION_DOMAIN=SYSTEM rather
+       * than GNUSTEP_INSTALLATION_DIR.  So we should also have the
+       * user select an installation domain rather than an actual
+       * directory (that would be pretty cool). -- Nicola
+       */
+      /*
+      [mff appendString: 
+	[NSString stringWithFormat: @"GNUSTEP_INSTALLATION_DIR = %@\n",
         installDir]];
+      */
     }
 }