diff --git a/FilesystemLayouts/fhs b/FilesystemLayouts/fhs
index ec812f8..9d82789 100644
--- a/FilesystemLayouts/fhs
+++ b/FilesystemLayouts/fhs
@@ -72,11 +72,11 @@ GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
 GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
 GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
 GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
-GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
-GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
-GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
-GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
-GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
-GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
+GNUSTEP_USER_DIR_LIBRARY=GNUstep
+GNUSTEP_USER_DIR_HEADERS=GNUstep/Headers
+GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Libraries
+GNUSTEP_USER_DIR_DOC=GNUstep/Documentation
+GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man
+GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info
 GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
 GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
diff --git a/FilesystemLayouts/fhs-system b/FilesystemLayouts/fhs-system
index 5cad594..8980067 100644
--- a/FilesystemLayouts/fhs-system
+++ b/FilesystemLayouts/fhs-system
@@ -81,11 +81,11 @@ GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
 GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
 GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
 GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
-GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
-GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
-GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
-GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
-GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
-GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
+GNUSTEP_USER_DIR_LIBRARY=GNUstep
+GNUSTEP_USER_DIR_HEADERS=GNUstep/Headers
+GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Libraries
+GNUSTEP_USER_DIR_DOC=GNUstep/Documentation
+GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man
+GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info
 GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
 GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
diff --git a/FilesystemLayouts/fhs-system-alt b/FilesystemLayouts/fhs-system-alt
new file mode 100644
index 0000000..3e7ac0c
--- /dev/null
+++ b/FilesystemLayouts/fhs-system-alt
@@ -0,0 +1,91 @@
+#
+# FHS (Filesystem Hierarchy Standard) filesystem layout for system installations
+#
+# This is the standard FHS Unix filesystem layout to use when
+# installing into /usr.  Use this if you want GNUstep to blend into
+# your GNU/Linux filesystem (or any other Unix with a similar
+# filesystem) and you are compiling gnustep-make so that it can be
+# shipped as part of a distribution/basic system installation.
+#
+# We put SYSTEM into /usr, and LOCAL into /usr/local.  This allows you
+# to make a distinction between stuff that you ship as part of your
+# system/distribution, and the local stuff installed by the local
+# sysadmin.  Make sure you compile/install all packages that you want
+# to go into /usr (ie, be part of the system/distribution) using 
+# 'make install GNUSTEP_INSTALLATION_DOMAIN=SYSTEM'
+#
+# To get system packages to work in this layout, you need /usr/bin in
+# your PATH, and /usr/lib in your /etc/ld.so.conf (or equivalent for
+# your Unix).  Don't forget to run ldconfig after installing a
+# library!
+#
+# Your users will need to also add /usr/local/bin to PATH and
+# /usr/local/lib to /etc/ld.so.conf (or equivalent for your Unix) if
+# they want to use the LOCAL domain.  To use gnustep-make in this
+# environment, use 'export
+# GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles'
+
+# By default, we install into /usr, but this can be overridden
+# by using ./configure --prefix=xxx when configuring.
+GNUSTEP_DEFAULT_PREFIX=/usr
+
+# These are only used by gnustep-base to implement the NSUserDirectory
+# API.  We never install anything in them.  They will be used as they
+# are without $prefix.
+GNUSTEP_SYSTEM_USERS_DIR=/home
+GNUSTEP_NETWORK_USERS_DIR=/home
+GNUSTEP_LOCAL_USERS_DIR=/home
+
+# NB: $prefix will be added to all the MAKEFILES/SYSTEM/NETWORK/LOCAL
+# paths.
+GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles
+
+GNUSTEP_SYSTEM_APPS=/lib@64@/GNUstep/Applications
+GNUSTEP_SYSTEM_ADMIN_APPS=/lib@64@/GNUstep/Applications
+GNUSTEP_SYSTEM_WEB_APPS=/lib@64@/GNUstep/WebApplications
+GNUSTEP_SYSTEM_TOOLS=/bin
+GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin
+GNUSTEP_SYSTEM_LIBRARY=/lib@64@/GNUstep
+GNUSTEP_SYSTEM_HEADERS=/include
+GNUSTEP_SYSTEM_LIBRARIES=/lib@64@
+GNUSTEP_SYSTEM_DOC=/share/doc/GNUstep
+GNUSTEP_SYSTEM_DOC_MAN=/share/man
+GNUSTEP_SYSTEM_DOC_INFO=/share/info
+
+GNUSTEP_NETWORK_APPS=/lib@64@/GNUstep/Applications
+GNUSTEP_NETWORK_ADMIN_APPS=/lib@64@/GNUstep/Applications
+GNUSTEP_NETWORK_WEB_APPS=/lib@64@/GNUstep/WebApplications
+GNUSTEP_NETWORK_TOOLS=/bin
+GNUSTEP_NETWORK_ADMIN_TOOLS=/sbin
+GNUSTEP_NETWORK_LIBRARY=/lib@64@/GNUstep
+GNUSTEP_NETWORK_HEADERS=/include
+GNUSTEP_NETWORK_LIBRARIES=/lib@64@
+GNUSTEP_NETWORK_DOC=/share/doc/GNUstep
+GNUSTEP_NETWORK_DOC_MAN=/share/man
+GNUSTEP_NETWORK_DOC_INFO=/share/info
+
+GNUSTEP_LOCAL_APPS=/lib@64@/GNUstep/Applications
+GNUSTEP_LOCAL_ADMIN_APPS=/lib@64@/GNUstep/Applications
+GNUSTEP_LOCAL_WEB_APPS=/lib@64@/GNUstep/WebApplications
+GNUSTEP_LOCAL_TOOLS=/bin
+GNUSTEP_LOCAL_ADMIN_TOOLS=/sbin
+GNUSTEP_LOCAL_LIBRARY=/lib@64@/GNUstep
+GNUSTEP_LOCAL_HEADERS=/include
+GNUSTEP_LOCAL_LIBRARIES=/lib@64@
+GNUSTEP_LOCAL_DOC=/share/doc/GNUstep
+GNUSTEP_LOCAL_DOC_MAN=/share/man
+GNUSTEP_LOCAL_DOC_INFO=/share/info
+
+GNUSTEP_USER_DIR_APPS=GNUstep/Applications
+GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
+GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
+GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
+GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
+GNUSTEP_USER_DIR_LIBRARY=GNUstep
+GNUSTEP_USER_DIR_HEADERS=GNUstep/Headers
+GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Libraries
+GNUSTEP_USER_DIR_DOC=GNUstep/Documentation
+GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man
+GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info
+GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
+GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
diff --git a/FilesystemLayouts/gnustep b/FilesystemLayouts/gnustep
index 5c44d86..46d7fd6 100644
--- a/FilesystemLayouts/gnustep
+++ b/FilesystemLayouts/gnustep
@@ -38,55 +38,55 @@ GNUSTEP_LOCAL_USERS_DIR=/home
 
 # NB: $prefix will be added to all the MAKEFILES/SYSTEM/NETWORK/LOCAL
 # paths.
-GNUSTEP_MAKEFILES=/System/Library/Makefiles
+GNUSTEP_MAKEFILES=/Makefiles
 
-GNUSTEP_SYSTEM_APPS=/System/Applications
-GNUSTEP_SYSTEM_ADMIN_APPS=/System/Applications/Admin
-GNUSTEP_SYSTEM_WEB_APPS=/System/Library/WebApplications
-GNUSTEP_SYSTEM_TOOLS=/System/Tools
-GNUSTEP_SYSTEM_ADMIN_TOOLS=/System/Tools/Admin
-GNUSTEP_SYSTEM_LIBRARY=/System/Library
-GNUSTEP_SYSTEM_HEADERS=/System/Library/Headers
-GNUSTEP_SYSTEM_LIBRARIES=/System/Library/Libraries
-GNUSTEP_SYSTEM_DOC=/System/Library/Documentation
-GNUSTEP_SYSTEM_DOC_MAN=/System/Library/Documentation/man
-GNUSTEP_SYSTEM_DOC_INFO=/System/Library/Documentation/info
+GNUSTEP_SYSTEM_APPS=/Applications
+GNUSTEP_SYSTEM_ADMIN_APPS=/Applications/Admin
+GNUSTEP_SYSTEM_WEB_APPS=/WebApplications
+GNUSTEP_SYSTEM_TOOLS=/Tools
+GNUSTEP_SYSTEM_ADMIN_TOOLS=/Tools/Admin
+GNUSTEP_SYSTEM_LIBRARY=/Libraries
+GNUSTEP_SYSTEM_HEADERS=/Headers
+GNUSTEP_SYSTEM_LIBRARIES=/Libraries
+GNUSTEP_SYSTEM_DOC=/Documentation
+GNUSTEP_SYSTEM_DOC_MAN=/Documentation/man
+GNUSTEP_SYSTEM_DOC_INFO=/Documentation/info
 
 GNUSTEP_NETWORK_APPS=/Local/Applications
 GNUSTEP_NETWORK_ADMIN_APPS=/Local/Applications/Admin
-GNUSTEP_NETWORK_WEB_APPS=/Local/Library/WebApplications
-GNUSTEP_NETWORK_TOOLS=/Local/Tools
-GNUSTEP_NETWORK_ADMIN_TOOLS=/Local/Tools/Admin
-GNUSTEP_NETWORK_LIBRARY=/Local/Library
-GNUSTEP_NETWORK_HEADERS=/Local/Library/Headers
-GNUSTEP_NETWORK_LIBRARIES=/Local/Library/Libraries
-GNUSTEP_NETWORK_DOC=/Local/Library/Documentation
-GNUSTEP_NETWORK_DOC_MAN=/Local/Library/Documentation/man
-GNUSTEP_NETWORK_DOC_INFO=/Local/Library/Documentation/info
+GNUSTEP_NETWORK_WEB_APPS=/WebApplications
+GNUSTEP_NETWORK_TOOLS=/Tools
+GNUSTEP_NETWORK_ADMIN_TOOLS=/Tools/Admin
+GNUSTEP_NETWORK_LIBRARY=/Libraries
+GNUSTEP_NETWORK_HEADERS=/Headers
+GNUSTEP_NETWORK_LIBRARIES=/Libraries
+GNUSTEP_NETWORK_DOC=/Documentation
+GNUSTEP_NETWORK_DOC_MAN=/Documentation/man
+GNUSTEP_NETWORK_DOC_INFO=/Documentation/info
 
-GNUSTEP_LOCAL_APPS=/Local/Applications
-GNUSTEP_LOCAL_ADMIN_APPS=/Local/Applications/Admin
-GNUSTEP_LOCAL_WEB_APPS=/Local/Library/WebApplications
-GNUSTEP_LOCAL_TOOLS=/Local/Tools
-GNUSTEP_LOCAL_ADMIN_TOOLS=/Local/Tools/Admin
-GNUSTEP_LOCAL_LIBRARY=/Local/Library
-GNUSTEP_LOCAL_HEADERS=/Local/Library/Headers
-GNUSTEP_LOCAL_LIBRARIES=/Local/Library/Libraries
-GNUSTEP_LOCAL_DOC=/Local/Library/Documentation
-GNUSTEP_LOCAL_DOC_MAN=/Local/Library/Documentation/man
-GNUSTEP_LOCAL_DOC_INFO=/Local/Library/Documentation/info
+GNUSTEP_LOCAL_APPS=/Applications
+GNUSTEP_LOCAL_ADMIN_APPS=/Applications/Admin
+GNUSTEP_LOCAL_WEB_APPS=/WebApplications
+GNUSTEP_LOCAL_TOOLS=/Tools
+GNUSTEP_LOCAL_ADMIN_TOOLS=/Tools/Admin
+GNUSTEP_LOCAL_LIBRARY=/Libraries
+GNUSTEP_LOCAL_HEADERS=/Headers
+GNUSTEP_LOCAL_LIBRARIES=/Libraries
+GNUSTEP_LOCAL_DOC=/Documentation
+GNUSTEP_LOCAL_DOC_MAN=/Documentation/man
+GNUSTEP_LOCAL_DOC_INFO=/Documentation/info
 
 GNUSTEP_USER_DIR_APPS=GNUstep/Applications
 GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
-GNUSTEP_USER_DIR_WEB_APPS=GNUstep/Library/WebApplications
+GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
 GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
 GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
-GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
-GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
-GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
-GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
-GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
-GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
+GNUSTEP_USER_DIR_LIBRARY=GNUstep
+GNUSTEP_USER_DIR_HEADERS=GNUstep/Headers
+GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Libraries
+GNUSTEP_USER_DIR_DOC=GNUstep/Documentation
+GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man
+GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info
 GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
 GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
 
diff --git a/FilesystemLayouts/gnustep-with-network b/FilesystemLayouts/gnustep-with-network
index 5b619cd..599089b 100644
--- a/FilesystemLayouts/gnustep-with-network
+++ b/FilesystemLayouts/gnustep-with-network
@@ -32,55 +32,55 @@ GNUSTEP_LOCAL_USERS_DIR=/home
 
 # NB: $prefix will be added to all the MAKEFILES/SYSTEM/NETWORK/LOCAL
 # paths.
-GNUSTEP_MAKEFILES=/System/Library/Makefiles
+GNUSTEP_MAKEFILES=/Makefiles
 
-GNUSTEP_SYSTEM_APPS=/System/Applications
-GNUSTEP_SYSTEM_ADMIN_APPS=/System/Applications/Admin
-GNUSTEP_SYSTEM_WEB_APPS=/System/Library/WebApplications
-GNUSTEP_SYSTEM_TOOLS=/System/Tools
-GNUSTEP_SYSTEM_ADMIN_TOOLS=/System/Tools/Admin
-GNUSTEP_SYSTEM_LIBRARY=/System/Library
-GNUSTEP_SYSTEM_HEADERS=/System/Library/Headers
-GNUSTEP_SYSTEM_LIBRARIES=/System/Library/Libraries
-GNUSTEP_SYSTEM_DOC=/System/Library/Documentation
-GNUSTEP_SYSTEM_DOC_MAN=/System/Library/Documentation/man
-GNUSTEP_SYSTEM_DOC_INFO=/System/Library/Documentation/info
+GNUSTEP_SYSTEM_APPS=/Applications
+GNUSTEP_SYSTEM_ADMIN_APPS=/Applications/Admin
+GNUSTEP_SYSTEM_WEB_APPS=/WebApplications
+GNUSTEP_SYSTEM_TOOLS=/Tools
+GNUSTEP_SYSTEM_ADMIN_TOOLS=/Tools/Admin
+GNUSTEP_SYSTEM_LIBRARY=/Libraries
+GNUSTEP_SYSTEM_HEADERS=/Headers
+GNUSTEP_SYSTEM_LIBRARIES=/Libraries
+GNUSTEP_SYSTEM_DOC=/Documentation
+GNUSTEP_SYSTEM_DOC_MAN=/Documentation/man
+GNUSTEP_SYSTEM_DOC_INFO=/Documentation/info
 
 GNUSTEP_NETWORK_APPS=/Network/Applications
 GNUSTEP_NETWORK_ADMIN_APPS=/Network/Applications/Admin
-GNUSTEP_NETWORK_WEB_APPS=/Network/Library/WebApplications
+GNUSTEP_NETWORK_WEB_APPS=/Network/WebApplications
 GNUSTEP_NETWORK_TOOLS=/Network/Tools
 GNUSTEP_NETWORK_ADMIN_TOOLS=/Network/Tools/Admin
-GNUSTEP_NETWORK_LIBRARY=/Network/Library
-GNUSTEP_NETWORK_HEADERS=/Network/Library/Headers
-GNUSTEP_NETWORK_LIBRARIES=/Network/Library/Libraries
-GNUSTEP_NETWORK_DOC=/Network/Library/Documentation
-GNUSTEP_NETWORK_DOC_MAN=/Network/Library/Documentation/man
-GNUSTEP_NETWORK_DOC_INFO=/Network/Library/Documentation/info
+GNUSTEP_NETWORK_LIBRARY=/Network/Libraries
+GNUSTEP_NETWORK_HEADERS=/Network/Headers
+GNUSTEP_NETWORK_LIBRARIES=/Network/Libraries
+GNUSTEP_NETWORK_DOC=/Network/Documentation
+GNUSTEP_NETWORK_DOC_MAN=/Network/Documentation/man
+GNUSTEP_NETWORK_DOC_INFO=/Network/Documentation/info
 
-GNUSTEP_LOCAL_APPS=/Local/Applications
-GNUSTEP_LOCAL_ADMIN_APPS=/Local/Applications/Admin
-GNUSTEP_LOCAL_WEB_APPS=/Local/Library/WebApplications
-GNUSTEP_LOCAL_TOOLS=/Local/Tools
-GNUSTEP_LOCAL_ADMIN_TOOLS=/Local/Tools/Admin
-GNUSTEP_LOCAL_LIBRARY=/Local/Library
-GNUSTEP_LOCAL_HEADERS=/Local/Library/Headers
-GNUSTEP_LOCAL_LIBRARIES=/Local/Library/Libraries
-GNUSTEP_LOCAL_DOC=/Local/Library/Documentation
-GNUSTEP_LOCAL_DOC_MAN=/Local/Library/Documentation/man
-GNUSTEP_LOCAL_DOC_INFO=/Local/Library/Documentation/info
+GNUSTEP_LOCAL_APPS=/Applications
+GNUSTEP_LOCAL_ADMIN_APPS=/Applications/Admin
+GNUSTEP_LOCAL_WEB_APPS=/WebApplications
+GNUSTEP_LOCAL_TOOLS=/Tools
+GNUSTEP_LOCAL_ADMIN_TOOLS=/Tools/Admin
+GNUSTEP_LOCAL_LIBRARY=/Libraries
+GNUSTEP_LOCAL_HEADERS=/Headers
+GNUSTEP_LOCAL_LIBRARIES=/Libraries
+GNUSTEP_LOCAL_DOC=/Documentation
+GNUSTEP_LOCAL_DOC_MAN=/Documentation/man
+GNUSTEP_LOCAL_DOC_INFO=/Documentation/info
 
 GNUSTEP_USER_DIR_APPS=GNUstep/Applications
 GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
-GNUSTEP_USER_DIR_WEB_APPS=GNUstep/Library/WebApplications
+GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
 GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
 GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
-GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
-GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
-GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
-GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
-GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
-GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
+GNUSTEP_USER_DIR_LIBRARY=GNUstep
+GNUSTEP_USER_DIR_HEADERS=GNUstep/Headers
+GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Libraries
+GNUSTEP_USER_DIR_DOC=GNUstep/Documentation
+GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man
+GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info
 GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
 GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
 
diff --git a/GNUstep-reset.sh b/GNUstep-reset.sh
index 5374184..a83998b 100644
--- a/GNUstep-reset.sh
+++ b/GNUstep-reset.sh
@@ -86,12 +86,12 @@ function reset_path
   fi
 }
 
-reset_path INFOPATH /Library/Documentation/info
-reset_path GUILE_LOAD_PATH /Library/Libraries/Guile
-reset_path CLASSPATH /Library/Libraries/Java
-reset_path LD_LIBRARY_PATH /Library/Libraries
-reset_path DYLD_LIBRARY_PATH /Library/Libraries
-reset_path DYLD_FRAMEWORK_PATH /Library/Frameworks
+reset_path INFOPATH /Documentation/info
+reset_path GUILE_LOAD_PATH /Libraries/Guile
+reset_path CLASSPATH /Libraries/Java
+reset_path LD_LIBRARY_PATH /Libraries
+reset_path DYLD_LIBRARY_PATH /Libraries
+reset_path DYLD_FRAMEWORK_PATH /Frameworks
 reset_path PATH /Tools
 
 # Make sure we destroy the reset_path function after using it - we don't
diff --git a/GNUstep.csh.in b/GNUstep.csh.in
index a13b19b..869e814 100755
--- a/GNUstep.csh.in
+++ b/GNUstep.csh.in
@@ -157,8 +157,8 @@ else
 endif
 
 if ( "@GNUSTEP_MULTI_PLATFORM@" == "" ) then
-  setenv GNUSTEP_HOST "@target@"
-  setenv GNUSTEP_HOST_CPU "@clean_target_cpu@"
+  setenv GNUSTEP_HOST ""
+  setenv GNUSTEP_HOST_CPU ""
   setenv GNUSTEP_HOST_VENDOR "@clean_target_vendor@"
   setenv GNUSTEP_HOST_OS "@clean_target_os@"
 endif
diff --git a/GNUstep.sh.in b/GNUstep.sh.in
index 52304a3..056b656 100755
--- a/GNUstep.sh.in
+++ b/GNUstep.sh.in
@@ -219,8 +219,8 @@ fi
 # to determine the platform at run time, by default we use the
 # hardcoded values of GNUSTEP_HOST*.
 if [ -z "@GNUSTEP_MULTI_PLATFORM@" ]; then
-  GNUSTEP_HOST=@target@
-  GNUSTEP_HOST_CPU=@clean_target_cpu@
+  GNUSTEP_HOST=
+  GNUSTEP_HOST_CPU=
   GNUSTEP_HOST_VENDOR=@clean_target_vendor@
   GNUSTEP_HOST_OS=@clean_target_os@
 fi
diff --git a/common.make b/common.make
index 708ecae..1d4a2c6 100644
--- a/common.make
+++ b/common.make
@@ -320,21 +320,21 @@ ifneq ($(GNUSTEP_INSTALLATION_DIR),)
   # Use GNUSTEP_INSTALLATION_DIR to set the installation dirs
   GNUSTEP_APPS                 = $(GNUSTEP_INSTALLATION_DIR)/Applications
   GNUSTEP_ADMIN_APPS           = $(GNUSTEP_INSTALLATION_DIR)/Applications/Admin
-  GNUSTEP_WEB_APPS             = $(GNUSTEP_INSTALLATION_DIR)/Library/WebApplications
+  GNUSTEP_WEB_APPS             = $(GNUSTEP_INSTALLATION_DIR)/WebApplications
   GNUSTEP_TOOLS                = $(GNUSTEP_INSTALLATION_DIR)/Tools
   GNUSTEP_ADMIN_TOOLS          = $(GNUSTEP_INSTALLATION_DIR)/Tools/Admin
-  GNUSTEP_LIBRARY              = $(GNUSTEP_INSTALLATION_DIR)/Library
+  GNUSTEP_LIBRARY              = $(GNUSTEP_INSTALLATION_DIR)
   GNUSTEP_SERVICES             = $(GNUSTEP_LIBRARY)/Services
   ifeq ($(GNUSTEP_IS_FLATTENED),yes)
-    GNUSTEP_HEADERS            = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers
+    GNUSTEP_HEADERS            = $(GNUSTEP_INSTALLATION_DIR)/Headers
   else
-    GNUSTEP_HEADERS            = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/$(GNUSTEP_TARGET_LDIR)
+    GNUSTEP_HEADERS            = $(GNUSTEP_INSTALLATION_DIR)/Headers/$(GNUSTEP_TARGET_LDIR)
   endif
   GNUSTEP_APPLICATION_SUPPORT  = $(GNUSTEP_LIBRARY)/ApplicationSupport
   GNUSTEP_BUNDLES              = $(GNUSTEP_LIBRARY)/Bundles
   GNUSTEP_FRAMEWORKS           = $(GNUSTEP_LIBRARY)/Frameworks
   GNUSTEP_PALETTES             = $(GNUSTEP_LIBRARY)/ApplicationSupport/Palettes
-  GNUSTEP_LIBRARIES            = $(GNUSTEP_INSTALLATION_DIR)/Library/Libraries
+  GNUSTEP_LIBRARIES            = $(GNUSTEP_INSTALLATION_DIR)/Libraries
   GNUSTEP_RESOURCES            = $(GNUSTEP_LIBRARY)/Libraries/Resources
   GNUSTEP_JAVA                 = $(GNUSTEP_LIBRARY)/Libraries/Java
   GNUSTEP_DOC                  = $(GNUSTEP_LIBRARY)/Documentation
diff --git a/config-noarch.make.in b/config-noarch.make.in
index 1af9e15..7a5a51f 100644
--- a/config-noarch.make.in
+++ b/config-noarch.make.in
@@ -147,8 +147,8 @@ endif
 # GNUSTEP_HOST*.
 
 ifeq ("@GNUSTEP_MULTI_PLATFORM@","")
-  GNUSTEP_HOST = @target@
-  GNUSTEP_HOST_CPU = @clean_target_cpu@
+  GNUSTEP_HOST = 
+  GNUSTEP_HOST_CPU = $(shell /usr/share/GNUstep/Makefiles/config.guess |sed 's/-.*//')
   GNUSTEP_HOST_VENDOR = @clean_target_vendor@
   GNUSTEP_HOST_OS = @clean_target_os@
 endif
diff --git a/config.guess b/config.guess
index 0967f2a..4bb422e 100755
--- a/config.guess
+++ b/config.guess
@@ -595,7 +595,7 @@ EOF
 	exit ;;
     *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+	if /usr/bin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
diff --git a/config.make.in b/config.make.in
index a9e5416..90cb338 100644
--- a/config.make.in
+++ b/config.make.in
@@ -184,7 +184,7 @@ endif
 
 # Any user specified libs
 CONFIG_SYSTEM_INCL=@INCLUDES@
-CONFIG_SYSTEM_LIBS = @LIBS@
+CONFIG_SYSTEM_LIBS = @LIBS@ ${LIBS}
 CONFIG_SYSTEM_LIB_DIR = @LIB_DIR@
 
 #
diff --git a/config.site b/config.site
index 143cfd7..bf8324a 100644
--- a/config.site
+++ b/config.site
@@ -71,7 +71,7 @@ fi
 
 # Change the data directory default
 if test "$datadir" = "\${prefix}/share" ; then
-   datadir="\${prefix}/Library/Libraries/share"
+   datadir="\${prefix}/Libraries/share"
 fi
 
 # xxx What about sysconfdir?
@@ -81,18 +81,18 @@ fi
 # Change the library directory default
 if test "$libdir" = "\${exec_prefix}/lib" ; then
   if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
-     libdir="\${exec_prefix}/Library/Libraries/${GNUSTEP_TARGET_CPU}/${GNUSTEP_TARGET_OS}"
+     libdir="\${exec_prefix}/Libraries/${GNUSTEP_TARGET_CPU}/${GNUSTEP_TARGET_OS}"
   else
-     libdir="\${exec_prefix}/Library/Libraries"
+     libdir="\${exec_prefix}/Libraries"
   fi
 fi
 
 # Change the include directory default
 if test "$includedir" = "\${prefix}/include" ; then
   if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
-   includedir="\${prefix}/Library/Headers/${LIBRARY_COMBO}"
+   includedir="\${prefix}/Headers/${LIBRARY_COMBO}"
   else
-   includedir="\${prefix}/Library/Headers"
+   includedir="\${prefix}/Headers"
   fi
 fi
 
@@ -100,11 +100,11 @@ fi
 
 # Change the info directory default
 if test "$infodir" = "\${prefix}/info" ; then
-   infodir="\${prefix}/Library/Documentation/info"
+   infodir="\${prefix}/Documentation/info"
 fi
 
 # Change the man directory default
 if test "$mandir" = "\${prefix}/man" ; then
-   mandir="\${prefix}/Library/Documentation/man"
+   mandir="\${prefix}/Documentation/man"
 fi
 
diff --git a/configure.ac b/configure.ac
index 8c54d1b..23c941c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -980,9 +980,9 @@ AC_SUBST(GNUSTEP_LOCAL_USERS_DIR)
 # These variables won't have any meaning with the new layouts.
 # They are deprecated and they *will* be removed.
 #--------------------------------------------------------------------
-GNUSTEP_SYSTEM_ROOT="$GNUSTEP_PREFIX/System"
-GNUSTEP_NETWORK_ROOT="$GNUSTEP_PREFIX/Network"
-GNUSTEP_LOCAL_ROOT="$GNUSTEP_PREFIX/Local"
+GNUSTEP_SYSTEM_ROOT="$GNUSTEP_PREFIX"
+GNUSTEP_NETWORK_ROOT="$GNUSTEP_PREFIX"
+GNUSTEP_LOCAL_ROOT="$GNUSTEP_PREFIX"
 GNUSTEP_USER_DIR="GNUstep"
 AC_SUBST(GNUSTEP_SYSTEM_ROOT)
 AC_SUBST(GNUSTEP_NETWORK_ROOT)
diff --git a/filesystem.make.in b/filesystem.make.in
index c24503c..249803b 100644
--- a/filesystem.make.in
+++ b/filesystem.make.in
@@ -74,7 +74,7 @@ GNUSTEP_SYSTEM_BUNDLES             = $(GNUSTEP_SYSTEM_LIBRARY)/Bundles
 GNUSTEP_SYSTEM_FRAMEWORKS          = $(GNUSTEP_SYSTEM_LIBRARY)/Frameworks
 GNUSTEP_SYSTEM_PALETTES            = $(GNUSTEP_SYSTEM_LIBRARY)/ApplicationSupport/Palettes
 GNUSTEP_SYSTEM_SERVICES            = $(GNUSTEP_SYSTEM_LIBRARY)/Services
-GNUSTEP_SYSTEM_RESOURCES           = $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Resources
+GNUSTEP_SYSTEM_RESOURCES           = $(GNUSTEP_SYSTEM_LIBRARY)/Resources
 GNUSTEP_SYSTEM_JAVA                = $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Java
 
 #