3 files changed, 21 insertions, 19 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 7bc365ffdfe..7c5ebf334ae 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -73,9 +73,9 @@ Savannah Project Page}.
 @end ifhtml
 
 There is a mailing list for @value{tramp}, available at
-@email{tramp-devel@@gnu.org}, and archived at
-@uref{https://lists.gnu.org/r/tramp-devel/, the
-@value{tramp} Mail Archive}.
+@email{@value{tramp-bug-report-address}}, and archived at
+@uref{https://lists.gnu.org/r/tramp-devel/, the @value{tramp} Mail
+Archive}.
 
 @page
 @insertcopying
@@ -3247,9 +3247,9 @@ discussing, and general discussions about @value{tramp}.
 post for moderator approval.  Sometimes this approval step may take as
 long as 48 hours due to public holidays.
 
-@email{tramp-devel@@gnu.org} is the mailing list.  Messages sent to
-this address go to all the subscribers.  This is @emph{not} the
-address to send subscription requests to.
+@email{@value{tramp-bug-report-address}} is the mailing list.
+Messages sent to this address go to all the subscribers.  This is
+@emph{not} the address to send subscription requests to.
 
 To subscribe to the mailing list, visit:
 @uref{https://lists.gnu.org/mailman/listinfo/tramp-devel/, the
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index db4654ce28e..aac7243446f 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -5,12 +5,12 @@
 @c Copyright (C) 2003-2018 Free Software Foundation, Inc.
 @c See file doclicense.texi for copying conditions.
 
-@c In the Tramp GIT, the version number is auto-frobbed from
-@c configure.ac, so you should edit that file and run
-@c "autoconf && ./configure" to change the version number.
+@c In the Tramp GIT, the version number is auto-frobbed from tramp.el,
+@c and the bug report address is auto-frobbed from configure.ac.
 @set trampver 2.4.1-pre
+@set tramp-bug-report-address tramp-devel@@gnu.org
 
-@c Other flags from configuration
+@c Other flags from configuration.
 @set instprefix /usr/local
 @set lispdir /usr/local/share/emacs/site-lisp
 @set infodir /usr/local/share/info
@@ -46,12 +46,15 @@
 @end ifset
 
 @c Macro for formatting a file name according to the respective
-@c syntax.  Macro arguments should not have any leading or trailing
-@c whitespace.  Not very elegant, but I don't know it better.
-
-@unmacro trampfn
+@c syntax.  trampver.texi is included several times in tramp.texi and
+@c trampinst.texi.  Redefining the macro is reported as warning for
+@c creating the dvi and pdf files, so we declare the macro only the
+@c first time this file is included.
+@ifclear trampfndefined
+@set trampfndefined
 @macro trampfn {method, userhost, localname}
 @value{prefix}@c
 \method\@value{postfixhop}@c
 \userhost\@value{postfix}\localname\
 @end macro
+@end ifclear
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 1956ab648b3..f17129a402b 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -25,11 +25,10 @@
 
 ;;; Code:
 
-;; In the Tramp GIT repository, the version number and the bug report
-;; address are auto-frobbed from configure.ac, so you should edit that
-;; file and run "autoconf && ./configure" to change them.  Emacs
-;; version check is defined in macro AC_EMACS_INFO of aclocal.m4;
-;; should be changed only there.
+;; In the Tramp GIT, the version number is auto-frobbed from tramp.el,
+;; and the bug report address is auto-frobbed from configure.ac.
+;; Emacs version check is defined in macro AC_EMACS_INFO of
+;; aclocal.m4; should be changed only there.
 
 ;;;###tramp-autoload
 (defconst tramp-version "2.4.1-pre"