diff --git a/ChangeLog b/ChangeLog
index 08a9d1c9c..840c66d0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-03-17  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* Jun T: 32494: Doc/zman.yo: Yodl hack to fix indentation
+	in nroff -man output.
+
 	* Jun T: 32493: Doc/Zsh/contrib.yo, Doc/Zsh/mod_pcre.yo,
 	Doc/Zsh/mod_regex.yo, Doc/Zsh/mod_sched.yo: some formatting
 	fixes.
diff --git a/Doc/zman.yo b/Doc/zman.yo
index 8d17f788b..3329cb975 100644
--- a/Doc/zman.yo
+++ b/Doc/zman.yo
@@ -110,7 +110,7 @@ def(startitem)(0)(\
 def(enditem)(0)(\
   ENDITEM()\
   STDPAR()\
-  +redef(ENDITEM)(0)(NOTRANS(.RE)STDPAR())\
+  +redef(ENDITEM)(0)(NOTRANS(.RE)STDPAR()redef(ENDITEM)(0)(CMT()))\
 )
 def(item)(2)(\
   NOTRANS(.TP)+NL()\
@@ -121,7 +121,7 @@ def(item)(2)(\
   +redef(PARAGRAPH)(0)(\
     NL()NOTRANS(.RS)+NL()NOTRANS(.PP)+NL()\
     STDPAR()\
-    +redef(ENDITEM)(0)(NOTRANS(.RE)STDPAR())\
+    +redef(ENDITEM)(0)(NOTRANS(.RE)STDPAR()redef(ENDITEM)(0)(CMT()))\
   )\
   ARG2\
   +ENDITEM()\