diff --git a/ChangeLog b/ChangeLog
index 9991a4a5..8bb4a1da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 19 10:20:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* rules.make: Add APPLICATION_ICON
+	* application.make: Use APPLICATION_ICON to add icon name to plist
+
 1999-04-27  Adam Fedor  <fedor@gnu.org>
 
 	* congif.site (includedir): Put include files in Headers, not in
diff --git a/application.make b/application.make
index ac47b79f..0a6ce966 100644
--- a/application.make
+++ b/application.make
@@ -33,6 +33,7 @@ include $(GNUSTEP_MAKEFILES)/rules.make
 # The name of the application is in the APP_NAME variable.
 # 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
 # where xxx is the application name
 #
 
@@ -163,6 +164,9 @@ $(APP_DIR_NAME)/Resources/Info-gnustep.plist: $(APP_DIR_NAME)/Resources
 	  else \
 	    echo "  NSMainNibFile = \"`echo $(MAIN_MODEL_FILE) | sed 's/.gmodel//'`\";"; \
 	  fi; \
+	  if [ "$(APPLICATION_ICON)" != "" ]; then \
+	    echo "  NSIcon = \"$(APPLICATION_ICON)\";"; \
+	  fi; \
 	  echo "  NSPrincipalClass = NSApplication;"; \
 	  echo "}") >$@
 
diff --git a/rules.make b/rules.make
index 9975bbf6..fe663b9e 100644
--- a/rules.make
+++ b/rules.make
@@ -192,6 +192,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
 	    HEADER_FILES_INSTALL_DIR="$($*_HEADER_FILES_INSTALL_DIR)" \
 	    RESOURCE_FILES="$($*_RESOURCE_FILES)" \
 	    MAIN_MODEL_FILE="$($*_MAIN_MODEL_FILE)" \
+	    APPLICATION_ICON="$($*_APPLICATION_ICON)" \
 	    RESOURCE_DIRS="$($*_RESOURCE_DIRS)" \
 	    BUNDLE_LIBS="$($*_BUNDLE_LIBS) $(BUNDLE_LIBS)" \
 	    SERVICE_INSTALL_DIR="$($*_SERVICE_INSTALL_DIR)" \