diff --git a/ChangeLog b/ChangeLog
index 9721bdab7..27ff99004 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-02  Werner Lemberg  <wl@gnu.org>
+
+	[docmaker] Thinko.
+
+	* src/tools/docmaker/content.py (DocBlock::get_markup_words_all):
+	Emit `/empty/' string for first element also.
+
 2014-12-02  Werner Lemberg  <wl@gnu.org>
 
 	[docmaker] Honour empty lines in `<Order>' section element.
diff --git a/src/tools/docmaker/content.py b/src/tools/docmaker/content.py
index 728b592a4..32ebd3f8d 100644
--- a/src/tools/docmaker/content.py
+++ b/src/tools/docmaker/content.py
@@ -610,14 +610,14 @@ class  DocBlock:
     def  get_markup_words_all( self, tag_name ):
         try:
             m = self.get_markup( tag_name )
-            words = m.fields[0].items[0].words
-            for item in m.fields[0].items[1:]:
+            words = []
+            for item in m.fields[0].items:
                 # We honour empty lines in an `<Order>' section element by
                 # adding the sentinel `/empty/'.  The formatter should then
                 # convert it to an appropriate representation in the
                 # `section_enter' function.
-                words.append( "/empty/" )
                 words += item.words
+                words.append( "/empty/" )
             return words
         except:
             return []