diff --git a/pep-0020.txt b/pep-0020.txt
index ffdbaf8bf..f81a44f10 100644
--- a/pep-0020.txt
+++ b/pep-0020.txt
@@ -1,8 +1,6 @@
 PEP: 20
 Title: The Zen of Python
-Version: $Revision$
-Last-Modified: $Date$
-Author: tim.peters@gmail.com (Tim Peters)
+Author: Tim Peters <tim.peters@gmail.com>
 Status: Active
 Type: Informational
 Content-Type: text/x-rst
@@ -10,7 +8,6 @@ Created: 19-Aug-2004
 Post-History: 22-Aug-2004
 
 
-
 Abstract
 ========
 
@@ -22,7 +19,7 @@ have been written down.
 The Zen of Python
 =================
 
-::
+.. code-block:: text
 
     Beautiful is better than ugly.
     Explicit is better than implicit.
@@ -48,7 +45,7 @@ The Zen of Python
 Easter Egg
 ==========
 
-::
+.. code-block:: pycon
 
   >>> import this
 
@@ -56,21 +53,12 @@ Easter Egg
 References
 ==========
 
-* Originally posted to comp.lang.python/python-list@python.org under a
-  thread called "The Way of Python"
-  https://groups.google.com/d/msg/comp.lang.python/B_VxeTBClM0/L8W9KlsiriUJ
+Originally posted to comp.lang.python/python-list@python.org under a
+thread called `"The Way of Python"
+<https://groups.google.com/d/msg/comp.lang.python/B_VxeTBClM0/L8W9KlsiriUJ>`__
 
 
 Copyright
 =========
 
 This document has been placed in the public domain.
-
-
-..
-   Local Variables:
-   mode: indented-text
-   indent-tabs-mode: nil
-   sentence-end-double-space: t
-   fill-column: 70
-   End: