diff --git a/ChangeLog b/ChangeLog
index ccc25c93ce..086ca940d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 20 18:24:39 CET 2008 Jim Meyering <meyering@redhat.com>
+
+	Avoid "make syntax-check" failure.
+	* docs/examples/index.py: Don't emit trailing blanks.
+	* docs/examples/Makefile.am: Regenerate.
+
 Wed Feb 20 11:52:27 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* qemud/remote.c: Update to non-deprecated PolicyKit apis
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 6b5963ebca..9da4e219e0 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -22,9 +22,9 @@ install-data-local:
 	-@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml \
 	  $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
 
-EXTRA_DIST=examples.xsl index.py examples.xml 
+EXTRA_DIST=examples.xsl index.py examples.xml
 
-noinst_PROGRAMS=info1 suspend 
+noinst_PROGRAMS=info1 suspend
 
 info1_SOURCES=info1.c
 info1_LDFLAGS=
@@ -36,7 +36,7 @@ suspend_LDFLAGS=
 suspend_DEPENDENCIES= $(DEPS)
 suspend_LDADD= $(LDADDS)
 
-valgrind: 
+valgrind:
 	$(MAKE) CHECKER='valgrind' tests
 
 tests: $(noinst_PROGRAMS)
diff --git a/docs/examples/index.py b/docs/examples/index.py
index 7ea89e1a2b..8f386ed339 100755
--- a/docs/examples/index.py
+++ b/docs/examples/index.py
@@ -245,18 +245,14 @@ install-data-local:
 	  $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
 
 """
-    EXTRA_DIST=""
-    for extra in extras:
-        EXTRA_DIST = EXTRA_DIST + extra + " "
+    EXTRA_DIST= string.join(extras, ' ')
     Makefile = Makefile + "EXTRA_DIST=%s\n\n" % (EXTRA_DIST)
-    noinst_PROGRAMS=""
-    for example in examples:
-        noinst_PROGRAMS = noinst_PROGRAMS + example + " "
+    noinst_PROGRAMS= string.join(examples, ' ')
     Makefile = Makefile + "noinst_PROGRAMS=%s\n\n" % (noinst_PROGRAMS)
     for example in examples:
         Makefile = Makefile + "%s_SOURCES=%s.c\n%s_LDFLAGS=\n%s_DEPENDENCIES= $(DEPS)\n%s_LDADD= $(LDADDS)\n\n" % (example, example, example,
 	       example, example)
-    Makefile = Makefile + "valgrind: \n\t$(MAKE) CHECKER='valgrind' tests\n\n"
+    Makefile = Makefile + "valgrind:\n\t$(MAKE) CHECKER='valgrind' tests\n\n"
     Makefile = Makefile + "tests: $(noinst_PROGRAMS)\n"
     Makefile = Makefile + "\t@(echo '## examples regression tests')\n"
 #    Makefile = Makefile + "\t@(echo > .memdump)\n"