diff --git a/man/docgen b/man/docgen
index f2fee0c1..0a388a74 100755
--- a/man/docgen
+++ b/man/docgen
@@ -489,9 +489,9 @@ def usage():
             % sys.argv[0])
     print("   -c :  Provide documentation for the specified configuration file")
     print("         (matches the given tag name in the source file)")
-    print("   -s :  Package name (for substitution)")
-    print("   -z :  Package short-name (for substitution)")
-    print("   -n :  Program name (for substitution)")
+    print("   -s :  Package name, e.g. Chocolate Doom (for substitution)")
+    print("   -z :  Package short-name, e.g. Chocolate (for substitution)")
+    print("   -n :  Program name, e.g. chocolate (for substitution)")
     print("   -m :  Manpage output")
     print("   -w :  Wikitext output")
     print("   -p :  Plaintext output")
diff --git a/man/doom.template b/man/doom.template
index da8d2141..5b63339a 100644
--- a/man/doom.template
+++ b/man/doom.template
@@ -6,7 +6,7 @@
 [\fIOPTIONS\fR]
 .SH DESCRIPTION
 .PP
-@PACKAGE_NAME@ is a port of Id Software's 1993 game "Doom" that is designed
+@PACKAGE_SHORTNAME@ Doom is a port of Id Software's 1993 game "Doom" that is designed
 to behave as similar to the original DOS version of Doom as is possible.
 .br
 @content