diff --git a/Doc/boilerplate.tex b/Doc/boilerplate.tex
index 10acf8d..c67bdb8 100644
--- a/Doc/boilerplate.tex
+++ b/Doc/boilerplate.tex
@@ -1,8 +1,10 @@
-\author{
-	Guido van Rossum \\
+\author{Guido van Rossum}
+
+\authoraddress{
 	Corporation for National Research Initiatives (CNRI) \\
 	1895 Preston White Drive, Reston, Va 20191, USA \\
-	E-mail: \code{guido@CNRI.Reston.Va.US}, \code{guido@python.org}
+	E-mail: \email{guido@CNRI.Reston.Va.US}, \email{guido@python.org}
 }
 
-\date{December 31, 1997 \\ Release 1.5} % XXX update before release!
+\date{December 31, 1997}			% XXX update before release!
+\release{1.5}
diff --git a/Doc/texinputs/boilerplate.tex b/Doc/texinputs/boilerplate.tex
index 10acf8d..c67bdb8 100644
--- a/Doc/texinputs/boilerplate.tex
+++ b/Doc/texinputs/boilerplate.tex
@@ -1,8 +1,10 @@
-\author{
-	Guido van Rossum \\
+\author{Guido van Rossum}
+
+\authoraddress{
 	Corporation for National Research Initiatives (CNRI) \\
 	1895 Preston White Drive, Reston, Va 20191, USA \\
-	E-mail: \code{guido@CNRI.Reston.Va.US}, \code{guido@python.org}
+	E-mail: \email{guido@CNRI.Reston.Va.US}, \email{guido@python.org}
 }
 
-\date{December 31, 1997 \\ Release 1.5} % XXX update before release!
+\date{December 31, 1997}			% XXX update before release!
+\release{1.5}