diff --git a/ChangeLog b/ChangeLog
index d364a5d..ef22c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-27  Adam Fedor  <fedor@gnu.org>
+
+	* PCAppProj/PCAppProj.pcproj, PCBaseFileTypes/PCBaseFileTypes.pcproj,
+	PCBundleProj/PCBundleProj.pcproj, PCGormProj/PCGormProj.pcproj,
+	PCLib/ProjectCenter.pcproj, PCLibProj/PCLibProj.pcproj,
+	PCRenaissanceProj/PCRenaissanceProj.pcproj, 
+	PCToolProj/PCToolProj.pcproj, ProjectCenter/ProjectCenter.pcproj:
+	Change $(GNUSTEP_SYSTEM_ROOT)/Makefiles to $(GNUSTEP_MAKEFILES)
+
 2003-04-23 Serg Stoyan <stoyan@hologr.com>
 
 	* PCLib/PCDefines.h: SeparateBuilder, SeparateLauncher,
diff --git a/PCAppProj/PCAppProj.pcproj b/PCAppProj/PCAppProj.pcproj
index a260ddd..e9f16d8 100644
--- a/PCAppProj/PCAppProj.pcproj
+++ b/PCAppProj/PCAppProj.pcproj
@@ -32,7 +32,7 @@
     );
     LINKEROPTIONS = "";
     MAININTERFACE = "";
-    MAKEFILEDIR = "$(GNUSTEP_SYSTEM_ROOT)/Makefiles";
+    MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)";
     OTHER_FILES = (
     );
     OTHER_RESOURCES = (
@@ -64,4 +64,4 @@
 	GNUmakefile,
 	GNUmakefile.postamble
     );
-}
\ No newline at end of file
+}
diff --git a/PCBaseFileTypes/PCBaseFileTypes.pcproj b/PCBaseFileTypes/PCBaseFileTypes.pcproj
index cdae10f..1528759 100644
--- a/PCBaseFileTypes/PCBaseFileTypes.pcproj
+++ b/PCBaseFileTypes/PCBaseFileTypes.pcproj
@@ -49,7 +49,7 @@
 	<key>MAININTERFACE</key>
 	<string></string>
 	<key>MAKEFILEDIR</key>
-	<string>$(GNUSTEP_SYSTEM_ROOT)/Makefiles</string>
+	<string>$(GNUSTEP_MAKEFILES)</string>
 	<key>OTHER_FILES</key>
 	<array/>
 	<key>OTHER_RESOURCES</key>
diff --git a/PCBundleProj/PCBundleProj.pcproj b/PCBundleProj/PCBundleProj.pcproj
index f3d38de..b98bc0b 100644
--- a/PCBundleProj/PCBundleProj.pcproj
+++ b/PCBundleProj/PCBundleProj.pcproj
@@ -32,7 +32,7 @@
     );
     LINKEROPTIONS = "";
     MAININTERFACE = "";
-    MAKEFILEDIR = "$(GNUSTEP_SYSTEM_ROOT)/Makefiles";
+    MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)";
     OTHER_FILES = (
     );
     OTHER_RESOURCES = (
@@ -60,4 +60,4 @@
 	GNUmakefile,
 	GNUmakefile.postamble
     );
-}
\ No newline at end of file
+}
diff --git a/PCGormProj/PCGormProj.pcproj b/PCGormProj/PCGormProj.pcproj
index 1719d67..b9a2dd3 100644
--- a/PCGormProj/PCGormProj.pcproj
+++ b/PCGormProj/PCGormProj.pcproj
@@ -32,7 +32,7 @@
     );
     LINKEROPTIONS = "";
     MAININTERFACE = "";
-    MAKEFILEDIR = "$(GNUSTEP_SYSTEM_ROOT)/Makefiles";
+    MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)";
     OTHER_FILES = (
     );
     OTHER_RESOURCES = (
@@ -64,4 +64,4 @@
 	GNUmakefile,
 	GNUmakefile.postamble
     );
-}
\ No newline at end of file
+}
diff --git a/PCLib/ProjectCenter.pcproj b/PCLib/ProjectCenter.pcproj
index 8cad31d..e20ae46 100644
--- a/PCLib/ProjectCenter.pcproj
+++ b/PCLib/ProjectCenter.pcproj
@@ -78,7 +78,7 @@
 	"gnustep-base"
     );
     LINKEROPTIONS = "";
-    MAKEFILEDIR = "$(GNUSTEP_SYSTEM_ROOT)/Makefiles";
+    MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)";
     OTHER_FILES = (
     );
     OTHER_RESOURCES = (
@@ -105,4 +105,4 @@
 	GNUmakefile,
 	GNUmakefile.postamble
     );
-}
\ No newline at end of file
+}
diff --git a/PCLibProj/PCLibProj.pcproj b/PCLibProj/PCLibProj.pcproj
index 7b1a3df..122f358 100644
--- a/PCLibProj/PCLibProj.pcproj
+++ b/PCLibProj/PCLibProj.pcproj
@@ -32,7 +32,7 @@
     );
     LINKEROPTIONS = "";
     MAININTERFACE = "";
-    MAKEFILEDIR = "$(GNUSTEP_SYSTEM_ROOT)/Makefiles";
+    MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)";
     OTHER_FILES = (
     );
     OTHER_RESOURCES = (
@@ -61,4 +61,4 @@
 	GNUmakefile,
 	GNUmakefile.postamble
     );
-}
\ No newline at end of file
+}
diff --git a/PCRenaissanceProj/PCRenaissanceProj.pcproj b/PCRenaissanceProj/PCRenaissanceProj.pcproj
index 592568d..8f4acbe 100644
--- a/PCRenaissanceProj/PCRenaissanceProj.pcproj
+++ b/PCRenaissanceProj/PCRenaissanceProj.pcproj
@@ -32,7 +32,7 @@
     );
     LINKEROPTIONS = "";
     MAININTERFACE = "";
-    MAKEFILEDIR = "$(GNUSTEP_SYSTEM_ROOT)/Makefiles";
+    MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)";
     OTHER_FILES = (
     );
     OTHER_RESOURCES = (
diff --git a/PCToolProj/PCToolProj.pcproj b/PCToolProj/PCToolProj.pcproj
index 521099d..c3d6d94 100644
--- a/PCToolProj/PCToolProj.pcproj
+++ b/PCToolProj/PCToolProj.pcproj
@@ -32,7 +32,7 @@
     );
     LINKEROPTIONS = "";
     MAININTERFACE = "";
-    MAKEFILEDIR = "$(GNUSTEP_SYSTEM_ROOT)/Makefiles";
+    MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)";
     OTHER_FILES = (
     );
     OTHER_RESOURCES = (
@@ -62,4 +62,4 @@
 	GNUmakefile,
 	GNUmakefile.postamble
     );
-}
\ No newline at end of file
+}
diff --git a/ProjectCenter/PCAppController.m b/ProjectCenter/PCAppController.m
index da4309c..c4044de 100644
--- a/ProjectCenter/PCAppController.m
+++ b/ProjectCenter/PCAppController.m
@@ -29,8 +29,8 @@
 
 #include <ProjectCenter/ProjectCenter.h>
 
-#define REL_LIB_PC @"Library/ProjectCenter"
-#define ABS_LIB_PC @"/usr/GNUstep/Local/Library/ProjectCenter"
+#define REL_LIB_PC @"Library/ApplicationSupport/ProjectCenter"
+#define ABS_LIB_PC @"/usr/GNUstep/Local/Library/ApplicationSupport/ProjectCenter"
 
 @implementation PCAppController