diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 244175e4102..b9cef59e38b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Michael Matz  <matz@suse.de>
+
+	* Makefile.in (write_entries_to_file): Quote words.
+	* gengtype.c: (read_input_line): Skip over leading white-space.
+
 2008-08-06  Marc Gauthier  <marc@tensilica.com>
 
 	* config.gcc: Match more processor names for Xtensa.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 1c22966d9d9..d5ee8c57be7 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -259,8 +259,8 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) \
 	$(foreach range, \
 	  $(shell i=1; while test $$i -le $(words $(1)); do \
 	     echo $$i; i=`expr $$i + $(write_entries_to_file_split)`; done), \
-	  $(shell echo $(wordlist $(range), \
-			  $(shell expr $(range) + $(write_entries_to_file_split) - 1), $(1)) \
+	  $(shell echo "$(wordlist $(range), \
+			  $(shell expr $(range) + $(write_entries_to_file_split) - 1), $(1))" \
 	     | tr ' ' '\n' >> $(2)))
 
 # --------
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index adc355a3881..02923a952d9 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -314,6 +314,10 @@ read_input_line (FILE *list, char **herep, char **linep,
   char *line;
   int c = getc (list);
 
+  /* Read over whitespace.  */
+  while (c == '\n' || c == ' ')
+    c = getc (list);
+
   if (c == EOF)
     {
       *linep = 0;