diff --git a/Makefile.am b/Makefile.am
line changes: +2/-1
index f7aa0fb..f298603
--- a/Makefile.am
+++ b/Makefile.am

@@ -28,6 +28,7 @@ EXTRA_DIST = \
 	README-dev \
 	ChangeLog.O \
 	m4/gnulib-cache.m4 \
+	man/hello.x \
 	contrib/de_franconian_po.txt \
 	contrib/evolution.txt
 

@@ -47,7 +48,7 @@ EXTRA_DIST += $(man_MANS)
 CLEANFILES = $(man_MANS)
 
 hello.1: hello
-	$(HELP2MAN) --name="friendly greeting program" $(top_builddir)/hello -o $@
+	$(HELP2MAN) --include=$(top_srcdir)/man/hello.x $(top_builddir)/hello -o $@
 
 TESTS = \
 	tests/greeting-1 \

diff --git a/man/hello.x b/man/hello.x
line changes: +6/-0
index 0000000..a1ec478
--- /dev/null
+++ b/man/hello.x

@@ -0,0 +1,6 @@
+[NAME]
+hello - friendly greeting program
+[BUGS]
+When --next-generation is combined with --greeting=TEXT, where the TEXT
+contains tabs and the terminal tab width is not 8 characters, the
+right-hand side of the frame can be incorrectly drawn.