diff --git a/ChangeLog b/ChangeLog
index e23f96772..ede218bdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-03  Mike Kestner  <mkestner@novell.com>
+
+	* bootstrap-generic : use automake --foreign to make automake-1.10
+	happy with gnu make function usage.
+
 2007-06-25  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/StatusIcon.custom : present_icon is in the glue lib.
diff --git a/bootstrap-generic b/bootstrap-generic
index 3e6f474c0..4ad6ba70c 100755
--- a/bootstrap-generic
+++ b/bootstrap-generic
@@ -117,8 +117,8 @@ if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
   autoheader || { echo "**Error**: autoheader failed."; exit 1; }
 fi
 
-echo "Running automake --gnu $am_opt ..."
-automake --add-missing --gnu $am_opt ||
+echo "Running automake --foreign $am_opt ..."
+automake --add-missing --foreign $am_opt ||
   { echo "**Error**: automake failed."; exit 1; }
 echo "Running autoconf ..."
 autoconf || { echo "**Error**: autoconf failed."; exit 1; }