diff --git a/ChangeLog b/ChangeLog
index afae5fe..d400932 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-19  Bruno Haible  <bruno@linuix.math.u-bordeaux.fr>
 
+        * src/key-list.cc (output_keyword_entry): Avoid outputting a struct
+          initializer of the form {"key",}.
+
         * src/iterator.cc: Don't include <stream.h>.
           From Michael Deutschmann <ldeutsch@mail.netshop.net>.
 
diff --git a/src/key-list.cc b/src/key-list.cc
index 8867dcd..21b27a1 100644
--- a/src/key-list.cc
+++ b/src/key-list.cc
@@ -1044,7 +1044,11 @@ output_keyword_entry (List_Node *temp, const char *indent)
     printf ("{");
   output_string (temp->key);
   if (option[TYPE])
-    printf (",%s}", temp->rest);
+    {
+      if (strlen (temp->rest) > 0)
+        printf (",%s", temp->rest);
+      printf ("}");
+    }
   if (option[DEBUG])
     printf (" /* hash value = %d, index = %d */",
             temp->hash_value, temp->index);