diff --git a/module/texinfo/html.scm b/module/texinfo/html.scm
index 81dd1f123..709744dc3 100644
--- a/module/texinfo/html.scm
+++ b/module/texinfo/html.scm
@@ -1,6 +1,6 @@
 ;;;; (texinfo html) -- translating stexinfo into shtml
 ;;;;
-;;;; 	Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;;;; 	Copyright (C) 2009, 2010, 2011  Free Software Foundation, Inc.
 ;;;;    Copyright (C) 2003,2004,2009 Andy Wingo <wingo at pobox dot com>
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
@@ -148,14 +148,12 @@ name, @code{#}, and the node name."
                (apply append body)))))
 
 (define (entry tag args . body)
-  (let lp ((headings (list (arg-req 'heading args))) (body body))
+  (let lp ((out `((dt ,@(arg-req 'heading args))))
+           (body body))
     (if (and (pair? body) (pair? (car body)) (eq? (caar body) 'itemx))
-        (lp (cons (cdar body) headings)
+        (lp (append out `(dt ,@(map stexi->shtml (cdar body))))
             (cdr body))
-        `(,@(map (lambda (heading)
-                   `(dt ,@(map stexi->shtml heading)))
-                 headings)
-          (dd ,@(map stexi->shtml body))))))
+        (append out `((dd ,@(map stexi->shtml body)))))))
 
 (define tag-replacements
   '((titlepage    div (@ (class "titlepage")))