diff -ur gnustep-make-1.11.0/GNUmakefile.in gnustep-make-1.11.0-test2/GNUmakefile.in
--- gnustep-make-1.11.0/GNUmakefile.in	2005-05-21 23:20:13.000000000 -0400
+++ gnustep-make-1.11.0-test2/GNUmakefile.in	2005-09-05 13:12:54.000000000 -0400
@@ -103,7 +103,7 @@
 INSTANCE_DOC_MAKE_FILES = autogsdoc.make gsdoc.make install_files.make \
                           javadoc.make latex.make texi.make
 
-all: generated-files which_lib$(EXEEXT) user_home$(EXEEXT)
+all: generated-files which_lib$(EXEEXT)
 
 # Please note that you should use a bit of care in the following rule,
 # because it must work in a directory which is not the source
@@ -113,10 +113,6 @@
 which_lib$(EXEEXT): which_lib.c config.h
 	$(CC) @CFLAGS@ -Wall -I. -o $@ $<
 
-user_home$(EXEEXT): user_home.c config.h
-	$(CC) @CFLAGS@ -DGNUSTEP_SYSTEM_ROOT=$(GNUSTEP_SYSTEM_ROOT) \
-	      -Wall -I. -o $@ $<
-
 ifeq ($(messages),yes)
   EC = 
 else
@@ -146,8 +142,6 @@
 	-$(EC) rm -f $(GNUSTEP_SYSTEM_ROOT)/Makefiles
 	 $(EC)(echo "Installing gnustep-make support software"; \
 	   $(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) \
-	     $(makedir)/$(GNUSTEP_TARGET_DIR); \
-	   $(INSTALL_PROGRAM) -m 755 user_home$(EXEEXT) \
 	     $(makedir)/$(GNUSTEP_TARGET_DIR))
 	 $(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
 		clean_cpu.sh clean_os.sh \
@@ -204,7 +198,6 @@
 
 uninstall:
 	rm -f $(makedir)/$(GNUSTEP_TARGET_DIR)/which_lib$(EXEEXT)
-	rm -f $(makedir)/$(GNUSTEP_TARGET_DIR)/user_home$(EXEEXT)
 	for f in config.guess config.sub install-sh mkinstalldirs \
 		clean_cpu.sh clean_os.sh \
 		clean_vendor.sh cpu.sh ld_lib_path.sh os.sh \
@@ -248,7 +241,7 @@
 # To really uninstall all of GNUstep, a 'rm -Rf ${GNUSTEP_ROOT}' should do.
 
 clean:
-	rm -f *~ which_lib$(EXEEXT) user_home$(EXEEXT) \
+	rm -f *~ which_lib$(EXEEXT) \
 	  Master/*~ Instance/*~ Instance/Shared/*~
 
 distclean: clean
diff -ur gnustep-make-1.11.0/GNUstep.sh.in gnustep-make-1.11.0-test2/GNUstep.sh.in
--- gnustep-make-1.11.0/GNUstep.sh.in	2005-05-21 23:20:13.000000000 -0400
+++ gnustep-make-1.11.0-test2/GNUstep.sh.in	2005-09-05 13:03:23.000000000 -0400
@@ -135,11 +135,12 @@
 #
 # Ask the user_home tool for the root path.
 #
-if [ -z "$GNUSTEP_FLATTENED" ]; then
-  GNUSTEP_USER_ROOT=`$GNUSTEP_MAKEFILES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/user_home user`
-else
-  GNUSTEP_USER_ROOT=`$GNUSTEP_MAKEFILES/user_home user`
-fi
+old_IFS=$IFS
+IFS=$'\n'
+[ -f /etc/GNUstep/GNUstep.conf ] && \
+	for i in `sed -e 's/\s=\s/=/' -e 's/^#.*$//g' -e '/USER_GNUSTEP_D/!d' /etc/GNUstep/GNUstep.conf`; do export $i; done
+IFS=$old_IFS
+GNUSTEP_USER_ROOT=`dirname ${HOME}/${USER_GNUSTEP_DIR}/prune`
 
 export GNUSTEP_USER_ROOT