diff --git a/ChangeLog b/ChangeLog
index 571c2015..d1793a1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-07-15  Adam Fedor  <fedor@gnu.org>
+
+	* application.make: Force Info-gnustep.plist to be remade everytime
+
+	* GNUstep.sh.in: Add $GNUSTEP_SYSTEM_ROOT/Libraries/man to MANPATH
+	* GNUstep.csh.in: Likewise.
+
 1999-07-14  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* target.make: Patch for threads on Solaris by bgg@itga.com.au
diff --git a/GNUstep.csh.in b/GNUstep.csh.in
index 93d86f75..e128406c 100755
--- a/GNUstep.csh.in
+++ b/GNUstep.csh.in
@@ -70,6 +70,12 @@ foreach dir ( `/bin/sh -c 'IFS=:; for i in ${GNUSTEP_PATHPREFIX_LIST}; do echo $
 end
 setenv PATH ${tp}${PATH}
 
+if ( ! ${?MANPATH} ) then
+  setenv MANPATH ${GNUSTEP_SYSTEM_ROOT}/Library/man:/usr/local/man:/usr/man
+else
+  setenv MANPATH ${GNUSTEP_SYSTEM_ROOT}/Library/man:${MANPATH}
+endif
+
 source ${GNUSTEP_SYSTEM_ROOT}/Makefiles/ld_lib_path.csh
 
 #
diff --git a/GNUstep.sh.in b/GNUstep.sh.in
index b05e404f..5ce2957b 100755
--- a/GNUstep.sh.in
+++ b/GNUstep.sh.in
@@ -75,6 +75,12 @@ for dir in $GNUSTEP_PATHPREFIX_LIST; do
 done
 PATH=$temp_path$PATH
 
+if [ -z "$MANPATH" ]; then
+  MANPATH=${GNUSTEP_SYSTEM_ROOT}/Library/man:/usr/local/man:/usr/man
+else
+  MANPATH=${GNUSTEP_SYSTEM_ROOT}/Library/man:${MANPATH}
+fi
+
 . $GNUSTEP_MAKEFILES/ld_lib_path.sh
 
 #
diff --git a/application.make b/application.make
index 600c5be5..592df18f 100644
--- a/application.make
+++ b/application.make
@@ -161,7 +161,7 @@ app-resource-files:: $(APP_DIR_NAME)/Resources/Info-gnustep.plist app-resource-d
 	  cp -r $(RESOURCE_FILES) $(APP_DIR_NAME)/Resources; \
 	fi)
 
-$(APP_DIR_NAME)/Resources/Info-gnustep.plist: $(APP_DIR_NAME)/Resources
+$(APP_DIR_NAME)/Resources/Info-gnustep.plist: $(APP_DIR_NAME)/Resources _FORCE
 	@(echo "{"; echo '  NOTE = "Automatically generated, do not edit!";'; \
 	  echo "  NSExecutable = \"$(INTERNAL_app_NAME)\";"; \
 	  if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
@@ -181,6 +181,8 @@ $(APP_DIR_NAME)/Resources/Info-gnustep.plist: $(APP_DIR_NAME)/Resources
 $(APP_DIR_NAME)/Resources:
 	@$(MKDIRS) $@
 
+_FORCE::
+
 internal-app-install::
 	rm -rf $(GNUSTEP_APPS)/$(APP_DIR_NAME)
 	$(TAR) cf - $(APP_DIR_NAME) | (cd $(GNUSTEP_APPS); $(TAR) xf -)