diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi
index 1fa9dd68..f14ee109 100644
--- a/libisoburn/trunk/xorriso/xorriso.texi
+++ b/libisoburn/trunk/xorriso/xorriso.texi
@@ -23,11 +23,12 @@
 @c   "@c man-ignore-lines begin" discards all following lines
 @c   up to "@c man-ignore-lines end".
 @c   Line blocks of "@menu" "@end menu" will be discarded.
-@c   "@item -word words" becomes "\fB\-word\fR words".
 @c   "@item word words" becomes "\fBword\fR words".
 @c   @strong{-...} gets mapped to \fB\-...\fR .
 @c   @strong{...} gets mapped to \fB...\fR .
 @c   @command{...} gets mapped to \fB...\fR .
+@c   @email{...} gets mapped to <...> .
+@c   Mapped {...} content is subject to the rules except {...} mapping.
 @c   @minus{} will become "-".
 @c   @@ , @{, @} will get stripped of their first @.
 @c   Other lines which begin by "@" will be discarded.
@@ -103,6 +104,7 @@ with Rock Ridge extensions.
 * Examples::            Examples
 * Files::               Files
 * Seealso::             See also
+* Bugreport::           Reporting bugs
 * Legal::               Author, Copyright, Credits
 * CommandIdx::          Alphabetic Command List
 * ConceptIdx::          Alphabetic List of Concepts and Objects
@@ -5521,7 +5523,7 @@ The default setting of -check_media abort_file= is:
 @c man MD5 checksums
 @c man .BR md5sum(1)
 @c man-ignore-lines begin
-@node Seealso, Legal, Files, Top 
+@node Seealso, Bugreport, Files, Top 
 @chapter See also
 @table @asis
 @item For the mkisofs emulation of @command{xorriso}
@@ -5547,8 +5549,26 @@ setfattr(1)
 md5sum(1)
 @end table
 @c man-ignore-lines end
+@c man .SH BUGS
+@node Bugreport, Legal, Seealso, Top
+@chapter Reporting bugs
+@cindex Bugs, reporting
+@cindex Problems, reporting
+To report bugs or to suggest enhancements for @command{xorriso}, please
+send electronic mail to the public lists @email{bug-xorriso@@gnu.org}
+or @email{libburn-hackers@@pykix.org}. If more privacy is desired, mail
+to @email{scdbackup@@gmx.net}.
+@*
+@sp 1
+Please describe what you expect @command{xorriso} to do,
+the program arguments resp. commands by which you tried to achieve it,
+the messages of @command{xorriso}, and the undesirable outcome of your
+program run.
+@*
+@sp 1
+Expect to get asked more questions before solutions can be proposed. 
 @c man .SH AUTHOR
-@node Legal, CommandIdx, Seealso, Top
+@node Legal, CommandIdx, Bugreport, Top
 @chapter Author, Copyright, Credits
 @section Author
 Thomas Schmitt <scdbackup@@gmx.net>
diff --git a/libisoburn/trunk/xorriso/xorrisofs.texi b/libisoburn/trunk/xorriso/xorrisofs.texi
index e741fee7..4d48b155 100644
--- a/libisoburn/trunk/xorriso/xorrisofs.texi
+++ b/libisoburn/trunk/xorriso/xorrisofs.texi
@@ -25,8 +25,10 @@
 @c   Line blocks of "@menu" "@end menu" will be discarded.
 @c   "@item -word words" becomes "\fB\-word\fR words".
 @c   "@item word words" becomes "\fBword\fR words".
-@c   @strong{-...} gets mapped to \fB\-...\fR .
 @c   @strong{...} gets mapped to \fB...\fR .
+@c   @command{...} gets mapped to \fB...\fR .
+@c   @email{...} gets mapped to <...> .
+@c   Mapped {...} content is subject to the rules except {...} mapping.
 @c   @minus{} will become "-".
 @c   @@ , @{, @} will get stripped of their first @.
 @c   Other lines which begin by "@" will be discarded.
@@ -96,6 +98,7 @@ xorrisofs -  Emulation of ISO 9660 program mkisofs by program xorriso
 * Examples::            Examples
 * Files::               Files
 * Seealso::             See also
+* Bugreport::           Reporting bugs
 * Legal::               Author, Copyright, Credits
 * CommandIdx::          Alphabetic Command List
 * ConceptIdx::          Alphabetic List of Concepts and Objects
@@ -1991,7 +1994,7 @@ Any other lines will be silently ignored.
 @c man MD5 checksums
 @c man .BR md5sum(1)
 @c man-ignore-lines begin
-@node Seealso, Legal, Files, Top 
+@node Seealso, Bugreport, Files, Top
 @chapter See also
 @table @asis
 @item For generic xorriso command mode
@@ -2016,8 +2019,26 @@ setfattr(1)
 md5sum(1)
 @end table
 @c man-ignore-lines end
+@c man .SH BUGS
+@node Bugreport, Legal, Seealso, Top
+@chapter Reporting bugs
+@cindex Bugs, reporting
+@cindex Problems, reporting
+To report bugs or to suggest enhancements for @command{xorriso}, please
+send electronic mail to the public lists @email{bug-xorriso@@gnu.org}
+or @email{libburn-hackers@@pykix.org}. If more privacy is desired, mail
+to @email{scdbackup@@gmx.net}.
+@*
+@sp 1
+Please describe what you expect @command{xorriso} to do,
+the program arguments resp. commands by which you tried to achieve it,
+the messages of @command{xorriso}, and the undesirable outcome of your
+program run.
+@*
+@sp 1
+Expect to get asked more questions before solutions can be proposed.
 @c man .SH AUTHOR
-@node Legal, CommandIdx, Seealso, Top
+@node Legal, CommandIdx, Bugreport, Top
 @chapter Author, Copyright, Credits
 @section Author
 Thomas Schmitt <scdbackup@@gmx.net>