diff --git a/ChangeLog b/ChangeLog
index b78994cc..9b1d8fc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 05 11:23:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* application.make: Added comment about including info.plist stuff.
+	* bundle.make: Added support for inclusion of info.plist stuff.
+
 1999-10-03  Lyndon Tremblay  <ltremblay@mezzanine.xnot.com>
 
 	* GNUstep.sh.in: Added CLASSPATH settings.
diff --git a/application.make b/application.make
index f6e51812..4053500e 100644
--- a/application.make
+++ b/application.make
@@ -34,6 +34,8 @@ include $(GNUSTEP_MAKEFILES)/rules.make
 # The list of application resource file are in xxx_RESOURCE_FILES
 # The list of application resource directories are in xxx_RESOURCE_DIRS
 # The name of the application icon (if any) is in xxx_APPLICATION_ICON
+# The name of a file containing info.plist entries to be inserted into
+# Info-gnustep.plist (if any) is xxxInfo.plist
 # where xxx is the application name
 #
 
diff --git a/bundle.make b/bundle.make
index a12cb70b..987e943b 100644
--- a/bundle.make
+++ b/bundle.make
@@ -33,6 +33,8 @@ include $(GNUSTEP_MAKEFILES)/rules.make
 # The list of bundle resource file are in xxx_RESOURCE_FILES
 # The list of bundle resource directories are in xxx_RESOURCE_DIRS
 # The name of the principal class is xxx_PRINCIPAL_CLASS
+# The name of a file containing info.plist entries to be inserted into
+# Info-gnustep.plist (if any) is xxxInfo.plist
 # where xxx is the bundle name
 #
 
@@ -121,6 +123,9 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources
 	    echo "  NSMainNibFile = \"`echo $(MAIN_MODEL_FILE) | sed 's/.gmodel//'`\";"; \
 	  fi; \
 	  echo "  NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
+	  if [ -r "$(INTERNAL_bundle_NAME)Info.plist" ]; then \
+	    cat $(INTERNAL_bundle_NAME)Info.plist; \
+	  fi; \
 	  echo "}") >$@
 
 internal-bundle-install:: $(BUNDLE_INSTALL_DIR)