diff -urN eclass-old/gnustep.eclass eclass-new/gnustep.eclass
--- eclass-old/gnustep.eclass	2006-09-03 20:35:51.000000000 +0200
+++ eclass-new/gnustep.eclass	2007-03-03 21:52:27.000000000 +0100
@@ -28,6 +28,8 @@
 #__GS_LOCAL_ROOT="/usr/GNUstep/Local"
 #__GS_NETWORK_ROOT="/usr/GNUstep/Network"
 #__GS_USER_ROOT="~/GNUstep"
+#__GS_USER_DIR="~/GNUstep"
+#__GS_USER_DEFAULTS_DIR="~/GNUstep/Defaults"
 ###########################################################################
 
 ###########################################################################
diff -urN eclass-old/gnustep-funcs.eclass eclass-new/gnustep-funcs.eclass
--- eclass-old/gnustep-funcs.eclass	2006-09-03 20:35:51.000000000 +0200
+++ eclass-new/gnustep-funcs.eclass	2007-03-03 21:59:40.000000000 +0100
@@ -84,7 +84,11 @@
 		__GS_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT}
 		__GS_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}
 		__GS_USER_ROOT=${GNUSTEP_USER_ROOT}
+		__GS_USER_DIR=${GNUSTEP_USER_DIR}
+		__GS_USER_DEFAULTS_DIR=${GNUSTEP_USER_DEFAULTS_DIR}
 		__GS_USER_ROOT_SUFFIX=$(dirname ${GNUSTEP_USER_ROOT#*$USER}/prune)/
+		__GS_USER_DIR_SUFFIX=$(dirname ${GNUSTEP_USER_DIR#*$USER}/prune)/
+		__GS_USER_DEFAULTS_DIR_SUFFIX=$(dirname ${GNUSTEP_USER_DEFAULTS_DIR#*$USER}/prune)/
 
 		# "gs_prefix" is the prefix that GNUstep is installed into, e.g.
 		#  gs_prefix=/usr/GNUstep => GNUSTEP_SYSTEM_ROOT=${gs_prefix}/System
@@ -95,11 +99,15 @@
 		# GNUSTEP_USER_ROOT and HOME, e.g.:
 		# "/home/something/whatever/.config/GNUstep" => ".config/GNUstep"
 		echo ${__GS_USER_ROOT_SUFFIX//\//XXX_SED_FSLASH} > ${TMP}/sed.gs_user_root_suffix
+		echo ${__GS_USER_DIR_SUFFIX//\//XXX_SED_FSLASH} > ${TMP}/sed.gs_user_dir_suffix
+		echo ${__GS_USER_DEFAULTS_DIR_SUFFIX//\//XXX_SED_FSLASH} > ${TMP}/sed.gs_user_defaults_dir_suffix
 
 		# Set up common env vars for make operations
 		__GS_MAKE_EVAL=" \
 			HOME=\"\${T}\" \
 			GNUSTEP_USER_ROOT=\"\${T}\" \
+			GNUSTEP_USER_DIR=\"\${T}\" \
+			GNUSTEP_USER_DEFAULTS_DIR=\"\${T}\"/Defaults \
 			GNUSTEP_DEFAULTS_ROOT=\"\${T}/\${__GS_USER_ROOT_SUFFIX}\" \
 			INSTALL_ROOT_DIR=\"\${D}\" \
 			GNUSTEP_INSTALLATION_DIR=\"\${D}/\$(egnustep_install_domain)\" \
@@ -157,6 +165,38 @@
 	echo ${!__GS_USER_ROOT_SUFFIX}
 }
 
+# Get/Set the GNUstep user dir
+# Note: watch out for this one -- ~ and such must be enclosed in single-quotes when passed in
+egnustep_user_dir() {
+	if [ "$1" ]; then
+		__GS_USER_DIR="$(dirname $1/prune)"
+	else
+		echo ${__GS_USER_DIR}
+	fi
+}
+
+# Print the "suffix" of the user_dir, or simply
+# e.g ~/GNUstep => GNUstep
+egnustep_user_dir_suffix() {
+	echo ${!__GS_USER_DIR_SUFFIX}
+}
+
+# Get/Set the GNUstep user defaults dir
+# Note: watch out for this one -- ~ and such must be enclosed in single-quotes when passed in
+egnustep_user_defaults_dir() {
+	if [ "$1" ]; then
+		__GS_USER_DEFAULTS_DIR="$(dirname $1/prune)"
+	else
+		echo ${__GS_USER_DEFAULTS_DIR}
+	fi
+}
+
+# Print the "suffix" of the user_defaults_dir, or simply
+# e.g ~/GNUstep/Defaults => GNUstep/Defaults
+egnustep_user_defaults_dir_suffix() {
+	echo ${!__GS_USER_DEFAULTS_DIR_SUFFIX}
+}
+
 # Make utilizing GNUstep Makefiles
 egnustep_make() {
 	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then