diff --git a/meta/guild.in b/meta/guild.in
index be4e5b5a3..17edf6019 100755
--- a/meta/guild.in
+++ b/meta/guild.in
@@ -39,8 +39,8 @@ exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
     (version (single-char #\v))))
 
 (define (display-version)
-  (version-etc "GNU Guile"
-               (effective-version)
+  (version-etc "@PACKAGE_NAME@"
+               (version)
                #:command-name "guild"
                #:license *LGPLv3+*))
 
diff --git a/module/scripts/help.scm b/module/scripts/help.scm
index e015ad532..107d39485 100644
--- a/module/scripts/help.scm
+++ b/module/scripts/help.scm
@@ -85,10 +85,7 @@
 (define (list-commands all?)
   (display "\
 Usage: guild COMMAND [ARGS]
-
-  guild runs command-line scripts provided by GNU Guile and related
-  programs.  See \"Using Guile Tools\" in the Guile manual, for more
-  information.
+Run command-line scripts provided by GNU Guile and related programs.
 
 Commands:
 ")
@@ -107,9 +104,14 @@ Commands:
                (format #t "  ~A ~23t~a\n" name summary)
                (format #t "  ~A\n" name)))))
    (find-submodules '(scripts)))
-  (display "
+  (format #t "
 For help on a specific command, try \"guild help COMMAND\".
-"))
+
+Report guild bugs to ~a
+GNU Guile home page: <http://www.gnu.org/software/guile/>
+General help using GNU software: <http://www.gnu.org/gethelp/>
+For complete documentation, run: info guile 'Using Guile Tools'
+" %guile-bug-report-address))
 
 (define (module-commentary mod)
   (file-commentary