Index: GNUstep.sh.in
===================================================================
--- GNUstep.sh.in	(revision 24324)
+++ GNUstep.sh.in	(working copy)
@@ -355,7 +355,33 @@
 export GUILE_LOAD_PATH
 unset guile_paths
 
+old_IFS="$IFS"
+IFS=:
+info_paths=
+for dir in $GNUSTEP_PATHLIST; do
 
+  if [ -z "$info_paths" ]; then
+    info_paths="$dir/Library/Documentation/info"
+  else
+    info_paths="$info_paths:$dir/Library/Documentation/info"
+  fi
+
+done
+IFS="$old_IFS"
+unset old_IFS
+unset dir
+
+if [ -z "$INFOPATH" ]; then
+  INFOPATH="$info_paths"
+else
+  if ( echo ${INFOPATH}| grep -v "${info_paths}" >/dev/null ); then
+    INFOPATH="$info_paths:$INFOPATH"
+  fi
+fi
+
+export INFOPATH 
+unset info_paths 
+
 #
 # Perform any user initialization
 #
Index: GNUstep.csh.in
===================================================================
--- GNUstep.csh.in	(revision 24324)
+++ GNUstep.csh.in	(working copy)
@@ -207,7 +207,7 @@
 
 unset gnustep_class_path
 
-set gnustep_guile_path="${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Libraries/Guile"
+set gnustep_guile_path="${GNUSTEP_USER_ROOT}/Library/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Library/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Library/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Library/Libraries/Guile"
 
 if ( $?GUILE_LOAD_PATH == 0 ) then
     setenv GUILE_LOAD_PATH "${gnustep_guile_path}"
@@ -217,6 +217,16 @@
 
 unset gnustep_guile_path
 
+set gnustep_info_path="${GNUSTEP_USER_ROOT}/Library/Documentation/info:${GNUSTEP_LOCAL_ROOT}/Library/Documentation/info:${GNUSTEP_NETWORK_ROOT}/Library/Documentation/info:${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/info"
+
+if ( $?INFOPATH == 0 ) then
+    setenv INFOPATH "${gnustep_info_path}"
+else if ( { (echo "${INFOPATH}" | fgrep -v "${gnustep_info_path}" >/dev/null) } ) then
+    setenv INFOPATH "${gnustep_info_path}:${INFOPATH}"
+endif
+
+unset gnustep_info_path
+
 #
 # Perform any user initialization
 #
Index: GNUstep-reset.sh
===================================================================
--- GNUstep-reset.sh	(revision 24324)
+++ GNUstep-reset.sh	(working copy)
@@ -87,6 +87,7 @@
 reset_path DYLD_LIBRARY_PATH /Library/Libraries
 reset_path DYLD_FRAMEWORK_PATH /Library/Frameworks
 reset_path PATH /Tools
+reset_path INFOPATH Library/Documentation/info
 
 # Make sure we destroy the reset_path function after using it - we don't
 # want to pollute the environment with it.