diff --git a/Framework/GNUmakefile b/Framework/GNUmakefile
index 3d2d8b3..1dee68f 100644
--- a/Framework/GNUmakefile
+++ b/Framework/GNUmakefile
@@ -2,9 +2,8 @@
 # GNUmakefile - Generated by ProjectCenter
 #
 
+GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
 include $(GNUSTEP_MAKEFILES)/common.make
-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
-
 
 #
 # Framework
diff --git a/GNUmakefile b/GNUmakefile
index bc876b5..83fa7a9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,9 +2,9 @@
 # GNUmakefile
 #
 
+GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
 include $(GNUSTEP_MAKEFILES)/common.make
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
-#GNUSTEP_BUILD_DIR = $(HOME)/Projects/GNUstep/==BUILD==/ProjectCenter
 
 #
 # Main application
@@ -18,7 +18,7 @@ ProjectCenter_APPLICATION_ICON = Images/ProjectCenter.tiff
 # Subprojects
 #
 SUBPROJECTS = \
-        Library \
+        Framework \
 	Modules
 
 #
diff --git a/Modules/GNUmakefile b/Modules/GNUmakefile
index 4b8f3a0..2946712 100644
--- a/Modules/GNUmakefile
+++ b/Modules/GNUmakefile
@@ -18,8 +18,6 @@
 #
 
 include $(GNUSTEP_MAKEFILES)/common.make
-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
-
 
 #
 # Subprojects
diff --git a/Modules/GNUmakefile.bundles b/Modules/GNUmakefile.bundles
index 1f45b21..d162f9e 100644
--- a/Modules/GNUmakefile.bundles
+++ b/Modules/GNUmakefile.bundles
@@ -5,7 +5,7 @@ ADDITIONAL_OBJCFLAGS +=
 ADDITIONAL_CFLAGS +=
 ADDITIONAL_CPPFLAGS +=
 ADDITIONAL_INCLUDE_DIRS += -I../../../ -I../../../Headers
-ADDITIONAL_LIB_DIRS += -L../../../Library/ProjectCenter.framework/Versions/Current
+ADDITIONAL_LIB_DIRS += -L../../../Framework/ProjectCenter.framework/Versions/Current
 
 BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Applications/ProjectCenter.app/Resources
 # $(BUNDLE_NAME)_STANDARD_INSTALL = no
@@ -18,7 +18,7 @@ ifeq ($(GNUSTEP_TARGET_OS), cygwin)
     DO_LIB_LINK=yes
 endif
 ifeq ($(DO_LIB_LINK), yes)
-    $(GNUSTEP_INSTANCE)_LIB_DIRS += -L../../../Library/ProjectCenter.framework
+    $(GNUSTEP_INSTANCE)_LIB_DIRS += -L../../../Framework/ProjectCenter.framework
     $(GNUSTEP_INSTANCE)_BUNDLE_LIBS += -lProjectCenter
 endif