--- yodl-1.31.18.orig/AUTHORS.txt
+++ yodl-1.31.18/AUTHORS.txt
@@ -3,7 +3,7 @@
 
 This file lists authors of Yodl, in alphabetical order.
 
-o    Frank Brokken <frank@icce.rug.nl>,
+o    Frank Brokken <f.b.brokken@rc.rug.nl>,
      http://www.icce.rug.nl/frank/frank.html
      Original author.
 
--- yodl-1.31.18.orig/src/yodl2html-post/lexer.l.in
+++ yodl-1.31.18/src/yodl2html-post/lexer.l.in
@@ -16,16 +16,10 @@
 #endif
 #   include "yodl2html-post.h"
 #   include "parser.h"
-
-#ifdef yywrap
-#   undef yywrap
-#endif
-static int yywrap ()
-{
-    return (1);
-}
 %}
 
+%option noyywrap
+
 %%
 
 "@TAGSTART@"            return (tok_starttag);
--- yodl-1.31.18.orig/src/yodl2html-post/lexer.l
+++ yodl-1.31.18/src/yodl2html-post/lexer.l
@@ -16,16 +16,10 @@
 #endif
 #   include "yodl2html-post.h"
 #   include "parser.h"
-
-#ifdef yywrap
-#   undef yywrap
-#endif
-static int yywrap ()
-{
-    return (1);
-}
 %}
 
+%option noyywrap
+
 %%
 
 ".YODLTAGSTART."            return (tok_starttag);
--- yodl-1.31.18.orig/macros/shared.yodoc.in
+++ yodl-1.31.18/macros/shared.yodoc.in
@@ -455,7 +455,7 @@
 DEFINEMACRO(endit)(0)(\
     latexcommand(\end{itemize})\
     texinfocommand(@end itemize)\
-    htmlcommand(</dl>)\
+    htmlcommand(</ul>)\
     whenman(ADDTOCOUNTER(XXinlistcounter)(-1))\
     whenms(ADDTOCOUNTER(XXinlistcounter)(-1))\
     sgmlcommand(</itemize>))
@@ -1755,7 +1755,7 @@
 DEFINEMACRO(startit)(0)(\
     latexcommand(\begin{itemize})\
     texinfocommand(@itemize @bullet)\
-    htmlcommand(<dl>)\
+    htmlcommand(<ul>)\
     whenman(ADDTOCOUNTER(XXinlistcounter)(1))\
     whenms(ADDTOCOUNTER(XXinlistcounter)(1))\
     sgmlcommand(<itemize>))
--- yodl-1.31.18.orig/macros/chartables/man.tables.yo
+++ yodl-1.31.18/macros/chartables/man.tables.yo
@@ -3,7 +3,7 @@
 DEFINECHARTABLE(standard)(
     '\\'    = "\\e"
     '.'	    = "\\&."
-    '\''    = "\\'"
+    '\''    = "\\&'"
 )
 
 COMMENT(*** Accent characters, leading to empty chars. ***)