diff --git a/pep-0200.txt b/pep-0200.txt
index 2ef83d6beb0..50e8107efba 100644
--- a/pep-0200.txt
+++ b/pep-0200.txt
@@ -314,7 +314,7 @@ Accepted and completed
 
     * Extended print statement - Barry Warsaw
       PEP 214
-      http://www.python.org/peps/pep-0214.html
+      http://www.python.org/dev/peps/pep-0214/
       SF Patch #100970
       http://sourceforge.net/patch/?func=detailpatch&patch_id=100970&group_id=5470
 
diff --git a/pep-0203.txt b/pep-0203.txt
index 77962978a9f..6a83789cf54 100644
--- a/pep-0203.txt
+++ b/pep-0203.txt
@@ -336,7 +336,7 @@ References
     [2] http://sourceforge.net/patch?func=detailpatch&patch_id=100699&group_id=5470
 
     [3] PEP 211, Adding A New Outer Product Operator, Wilson
-        http://www.python.org/peps/pep-0211.html
+        http://www.python.org/dev/peps/pep-0211/
 
 
 
diff --git a/pep-0211.txt b/pep-0211.txt
index 11ca0983661..d9f79551a49 100644
--- a/pep-0211.txt
+++ b/pep-0211.txt
@@ -174,14 +174,14 @@ Acknowledgments
 References
 
     [1] PEP 225, Elementwise/Objectwise Operators, Zhu, Lielens
-        http://www.python.org/peps/pep-0225.html
+        http://www.python.org/dev/peps/pep-0225/
 
     [2] http://bevo.che.wisc.edu/octave/
 
     [3] http://www.egroups.com/message/python-numeric/4
 
     [4] PEP 201, Lockstep Iteration, Warsaw
-        http://www.python.org/peps/pep-0201.html
+        http://www.python.org/dev/peps/pep-0201/
 
     [5] http://mail.python.org/pipermail/python-dev/2000-July/006427.html
 
diff --git a/pep-0225.txt b/pep-0225.txt
index 71a5703fc47..a1bb4eed29a 100644
--- a/pep-0225.txt
+++ b/pep-0225.txt
@@ -767,7 +767,7 @@ Credits and archives
     Its first (and current) version is at:
 
         http://www.python.org/pipermail/python-dev/2000-August/014876.html
-        http://www.python.org/peps/pep-0211.html
+        http://www.python.org/dev/peps/pep-0211/
 
 
 Additional References
diff --git a/pep-0231.txt b/pep-0231.txt
index ab5533aef1b..b9fb302f483 100644
--- a/pep-0231.txt
+++ b/pep-0231.txt
@@ -602,7 +602,7 @@ References
     [7] http://www.foretec.com/python/workshops/1998-11/dd-ascher-sum.html
     [8] http://docs.python.org/howto/regex.html
     [9] PEP 213, Attribute Access Handlers, Prescod
-        http://www.python.org/peps/pep-0213.html
+        http://www.python.org/dev/peps/pep-0213/
 
 
 Rejection
diff --git a/pep-0236.txt b/pep-0236.txt
index cee84248407..8e21b18b95b 100644
--- a/pep-0236.txt
+++ b/pep-0236.txt
@@ -345,13 +345,13 @@ Copyright
 References and Footnotes
 
     [1] PEP 5, Guidelines for Language Evolution, Prescod
-        http://www.python.org/peps/pep-0005.html
+        http://www.python.org/dev/peps/pep-0005/
 
     [2] PEP 227, Statically Nested Scopes, Hylton
-        http://www.python.org/peps/pep-0227.html
+        http://www.python.org/dev/peps/pep-0227/
 
     [3] PEP 230, Warning Framework, Van Rossum
-        http://www.python.org/peps/pep-0230.html
+        http://www.python.org/dev/peps/pep-0230/
 
     [4] Note that this is "may" and not "will":  better safe than sorry.  Of
         course spurious warnings won't be generated when avoidable with
diff --git a/pep-0238.txt b/pep-0238.txt
index 46b7896a4ec..35e05bbf31a 100644
--- a/pep-0238.txt
+++ b/pep-0238.txt
@@ -498,22 +498,22 @@ Implementation
 References
 
     [0] PEP 228, Reworking Python's Numeric Model
-        http://www.python.org/peps/pep-0228.html
+        http://www.python.org/dev/peps/pep-0228/
 
     [1] PEP 237, Unifying Long Integers and Integers, Zadka,
-        http://www.python.org/peps/pep-0237.html
+        http://www.python.org/dev/peps/pep-0237/
 
     [2] PEP 239, Adding a Rational Type to Python, Zadka,
-        http://www.python.org/peps/pep-0239.html
+        http://www.python.org/dev/peps/pep-0239/
 
     [3] PEP 240, Adding a Rational Literal to Python, Zadka,
-        http://www.python.org/peps/pep-0240.html
+        http://www.python.org/dev/peps/pep-0240/
 
     [4] PEP 236, Back to the __future__, Peters,
-        http://www.python.org/peps/pep-0236.html
+        http://www.python.org/dev/peps/pep-0236/
 
     [5] PEP 264, Future statements in simulated shells
-        http://www.python.org/peps/pep-0236.html
+        http://www.python.org/dev/peps/pep-0236/
 
 
 Copyright
diff --git a/pep-0239.txt b/pep-0239.txt
index abd0b9de7c4..e91cd8b890d 100644
--- a/pep-0239.txt
+++ b/pep-0239.txt
@@ -115,7 +115,7 @@ Open Issues
 References
 
     [1] PEP 240, Adding a Rational Literal to Python, Zadka,
-        http://www.python.org/peps/pep-0240.html
+        http://www.python.org/dev/peps/pep-0240/
 
 
 Copyright
diff --git a/pep-0240.txt b/pep-0240.txt
index 6a8d0512b7b..4f750151ade 100644
--- a/pep-0240.txt
+++ b/pep-0240.txt
@@ -80,7 +80,7 @@ Common Objections
 References
 
     [1] PEP 239, Adding a Rational Type to Python, Zadka,
-        http://www.python.org/peps/pep-0239.html
+        http://www.python.org/dev/peps/pep-0239/
 
 
 Copyright
diff --git a/pep-0243.txt b/pep-0243.txt
index ca955670a4f..ce68b1e3bf3 100644
--- a/pep-0243.txt
+++ b/pep-0243.txt
@@ -163,7 +163,7 @@ Status
 References
 
     [1] Metadata for Python Software Package, Kuchling,
-        http://www.python.org/peps/pep-0241.html
+        http://www.python.org/dev/peps/pep-0241/
 
     [2] RFC 1867, Form-based File Upload in HTML
         http://www.faqs.org/rfcs/rfc1867.html
diff --git a/pep-0244.txt b/pep-0244.txt
index a96b9b43f82..1f119f42d26 100644
--- a/pep-0244.txt
+++ b/pep-0244.txt
@@ -153,13 +153,13 @@ Questions and Answers
 References and Footnotes
 
     [1] PEP 5, Guidelines for Language Evolution, Prescod
-        http://www.python.org/peps/pep-0005.html
+        http://www.python.org/dev/peps/pep-0005/
 
     [2] PEP 227, Statically Nested Scopes, Hylton
-        http://www.python.org/peps/pep-0227.html
+        http://www.python.org/dev/peps/pep-0227/
 
     [3] PEP 236, Back to the __future__, Peters
-        http://www.python.org/peps/pep-0236.html
+        http://www.python.org/dev/peps/pep-0236/
 
 
 Copyright
diff --git a/pep-0245.txt b/pep-0245.txt
index 260531473f2..bef3db89082 100644
--- a/pep-0245.txt
+++ b/pep-0245.txt
@@ -478,18 +478,18 @@ References
     [2] http://www.zope.org
 
     [3] PEP 232, Function Attributes, Warsaw
-        http://www.python.org/peps/pep-0232.html
+        http://www.python.org/dev/peps/pep-0232/
 
     [4] PEP 233, Python Online Help, Prescod
-        http://www.python.org/peps/pep-0233.html
+        http://www.python.org/dev/peps/pep-0233/
 
     [5] http://www.lemburg.com/files/python/mxProxy.html
 
     [6] PEP 236, Back to the __future__, Peters
-        http://www.python.org/peps/pep-0236.html
+        http://www.python.org/dev/peps/pep-0236/
 
     [7] PEP 230, Warning Framework, van Rossum
-        http://www.python.org/peps/pep-0236.html
+        http://www.python.org/dev/peps/pep-0236/
 
 
 Copyright
diff --git a/pep-0246.txt b/pep-0246.txt
index c76fd05d26b..aed219f6843 100644
--- a/pep-0246.txt
+++ b/pep-0246.txt
@@ -720,7 +720,7 @@ Credits
 References and Footnotes
 
     [1] PEP 245, Python Interface Syntax, Pelletier
-        http://www.python.org/peps/pep-0245.html
+        http://www.python.org/dev/peps/pep-0245/
 
     [2] http://www.zope.org/Wikis/Interfaces/FrontPage
 
diff --git a/pep-0251.txt b/pep-0251.txt
index c4420f16208..08587b575d3 100644
--- a/pep-0251.txt
+++ b/pep-0251.txt
@@ -68,7 +68,7 @@ New features for Python 2.2
 References
 
     [1] PEP 101, Doing Python Releases 101
-        http://www.python.org/peps/pep-0101.html
+        http://www.python.org/dev/peps/pep-0101/
 
     [2] Misc/NEWS file from CVS
         http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/python/python/dist/src/Misc/NEWS?rev=1.337.2.4&content-type=text/vnd.viewcvs-markup
diff --git a/pep-0255.txt b/pep-0255.txt
index e938592630b..f9a31257d64 100644
--- a/pep-0255.txt
+++ b/pep-0255.txt
@@ -472,12 +472,12 @@ Reference Implementation
 Footnotes and References
 
     [1] PEP 234, Iterators, Yee, Van Rossum
-        http://www.python.org/peps/pep-0234.html
+        http://www.python.org/dev/peps/pep-0234/
 
     [2] http://www.stackless.com/
 
     [3] PEP 219, Stackless Python, McMillan
-        http://www.python.org/peps/pep-0219.html
+        http://www.python.org/dev/peps/pep-0219/
 
     [4] "Iteration Abstraction in Sather"
         Murer , Omohundro, Stoutamire and Szyperski
@@ -490,7 +490,7 @@ Footnotes and References
     [7] http://python.ca/nas/python/generator.diff
 
     [8] PEP 236, Back to the __future__, Peters
-        http://www.python.org/peps/pep-0236.html
+        http://www.python.org/dev/peps/pep-0236/
 
     [9] To experiment with this implementation, check out Python from CVS
         according to the instructions at
diff --git a/pep-0256.txt b/pep-0256.txt
index 53e006c5255..ccb5b715e42 100644
--- a/pep-0256.txt
+++ b/pep-0256.txt
@@ -242,13 +242,13 @@ References and Footnotes
 ========================
 
 .. [#PEP-287] PEP 287, reStructuredText Docstring Format, Goodger
-   (http://www.python.org/peps/pep-0287.html)
+   (http://www.python.org/dev/peps/pep-0287/)
 
 .. [#PEP-257] PEP 257, Docstring Conventions, Goodger, Van Rossum
-   (http://www.python.org/peps/pep-0257.html)
+   (http://www.python.org/dev/peps/pep-0257/)
 
 .. [#PEP-258] PEP 258, Docutils Design Specification, Goodger
-   (http://www.python.org/peps/pep-0258.html)
+   (http://www.python.org/dev/peps/pep-0258/)
 
 .. _Literate Programming: http://www.literateprogramming.com/
 
diff --git a/pep-0257.txt b/pep-0257.txt
index 54e83502f82..a625b2431a1 100644
--- a/pep-0257.txt
+++ b/pep-0257.txt
@@ -286,10 +286,10 @@ References and Footnotes
 ========================
 
 .. [1] PEP 256, Docstring Processing System Framework, Goodger
-   (http://www.python.org/peps/pep-0256.html)
+   (http://www.python.org/dev/peps/pep-0256/)
 
 .. [2] PEP 258, Docutils Design Specification, Goodger
-   (http://www.python.org/peps/pep-0258.html)
+   (http://www.python.org/dev/peps/pep-0258/)
 
 .. [3] Guido van Rossum, Python's creator and Benevolent Dictator For
    Life.
diff --git a/pep-0258.txt b/pep-0258.txt
index 83a8cca99cf..000d561790d 100644
--- a/pep-0258.txt
+++ b/pep-0258.txt
@@ -951,13 +951,13 @@ stylist code will lower the barrier considerably.
 ==========================
 
 .. [#PEP-256] PEP 256, Docstring Processing System Framework, Goodger
-   (http://www.python.org/peps/pep-0256.html)
+   (http://www.python.org/dev/peps/pep-0256/)
 
 .. [#PEP-224] PEP 224, Attribute Docstrings, Lemburg
-   (http://www.python.org/peps/pep-0224.html)
+   (http://www.python.org/dev/peps/pep-0224/)
 
 .. [#PEP-216] PEP 216, Docstring Format, Zadka
-   (http://www.python.org/peps/pep-0216.html)
+   (http://www.python.org/dev/peps/pep-0216/)
 
 .. _docutils.dtd:
    http://docutils.sourceforge.net/docs/ref/docutils.dtd
diff --git a/pep-0269.txt b/pep-0269.txt
index ff05f62e92f..52f180b17ba 100644
--- a/pep-0269.txt
+++ b/pep-0269.txt
@@ -169,7 +169,7 @@ References
         http://docs.python.org/library/compiler.html
 
     [4] Pelletier, Michel. "Python Interface Syntax", PEP-245.
-        http://www.python.org/peps/pep-0245.html
+        http://www.python.org/dev/peps/pep-0245/
 
     [5] The Python Types-SIG
         http://www.python.org/sigs/types-sig/
diff --git a/pep-0274.txt b/pep-0274.txt
index dc87b71b2cc..2bc1e48fed7 100644
--- a/pep-0274.txt
+++ b/pep-0274.txt
@@ -139,7 +139,7 @@ Implementation
 References
 
     [1] PEP 202, List Comprehensions
-        http://www.python.org/peps/pep-0202.html
+        http://www.python.org/dev/peps/pep-0202/
 
 
 Copyright
diff --git a/pep-0276.txt b/pep-0276.txt
index a451a4ae68a..3072f8693c2 100644
--- a/pep-0276.txt
+++ b/pep-0276.txt
@@ -407,13 +407,13 @@ Implementation
 References
 
     [1] PEP 234, Iterators
-    http://www.python.org/peps/pep-0234.html
+    http://www.python.org/dev/peps/pep-0234/
 
     [2] PEP 204, Range Literals
-    http://www.python.org/peps/pep-0204.html
+    http://www.python.org/dev/peps/pep-0204/
 
     [3] PEP 212, Loop Counter Iteration
-    http://www.python.org/peps/pep-0212.html
+    http://www.python.org/dev/peps/pep-0212/
 
 
 Copyright
diff --git a/pep-0281.txt b/pep-0281.txt
index aa112b8b42e..529990f07c1 100644
--- a/pep-0281.txt
+++ b/pep-0281.txt
@@ -131,7 +131,7 @@ Backwards Compatibility
 References and Footnotes
 
    [1] PEP 212, Loop Counter Iteration
-       http://www.python.org/peps/pep-0212.html
+       http://www.python.org/dev/peps/pep-0212/
 
 
 Copyright
diff --git a/pep-0284.txt b/pep-0284.txt
index 9ebd13c858a..2c46b8a1431 100644
--- a/pep-0284.txt
+++ b/pep-0284.txt
@@ -247,16 +247,16 @@ Implementation
 References
 
     [1] PEP 204, Range Literals
-        http://www.python.org/peps/pep-0204.html
+        http://www.python.org/dev/peps/pep-0204/
 
     [2] PEP 212, Loop Counter Iteration
-        http://www.python.org/peps/pep-0212.html
+        http://www.python.org/dev/peps/pep-0212/
 
     [3] PEP 281, Loop Counter Iteration with range and xrange
-        http://www.python.org/peps/pep-0281.html
+        http://www.python.org/dev/peps/pep-0281/
 
     [4] PEP 276, Simple Iterator for ints
-        http://www.python.org/peps/pep-0276.html
+        http://www.python.org/dev/peps/pep-0276/
 
 
 Copyright
diff --git a/pep-0287.txt b/pep-0287.txt
index 0b703d09079..ffc8132a8e0 100644
--- a/pep-0287.txt
+++ b/pep-0287.txt
@@ -564,7 +564,7 @@ Questions & Answers
            [1] http://www.example.org/
 
            [2] PEP 9876, Let's Hope We Never Get Here
-               http://www.python.org/peps/pep-9876.html
+               http://www.python.org/dev/peps/pep-9876/
 
            [3] "Bogus Complexity Addition"
 
@@ -728,10 +728,10 @@ References & Footnotes
 ======================
 
 .. [#PEP-1] PEP 1, PEP Guidelines, Warsaw, Hylton
-   (http://www.python.org/peps/pep-0001.html)
+   (http://www.python.org/dev/peps/pep-0001/)
 
 .. [#PEP-9] PEP 9, Sample PEP Template, Warsaw
-   (http://www.python.org/peps/pep-0009.html)
+   (http://www.python.org/dev/peps/pep-0009/)
 
 .. [#Zen] From `The Zen of Python (by Tim Peters)`__ (or just
    "``import this``" in Python)
@@ -739,7 +739,7 @@ References & Footnotes
 __ http://www.python.org/doc/Humor.html#zen
 
 .. [#PEP-216] PEP 216, Docstring Format, Zadka
-   (http://www.python.org/peps/pep-0216.html)
+   (http://www.python.org/dev/peps/pep-0216/)
 
 .. _reStructuredText markup: http://docutils.sourceforge.net/rst.html
 
diff --git a/pep-0288.txt b/pep-0288.txt
index 753c415dd12..3a594161deb 100644
--- a/pep-0288.txt
+++ b/pep-0288.txt
@@ -143,7 +143,7 @@ References
         http://gnosis.cx/publish/programming/charming_python_b7.txt
 
     [2] PEP 255 Simple Generators:
-        http://www.python.org/peps/pep-0255.html
+        http://www.python.org/dev/peps/pep-0255/
 
     [3] Proof-of-concept recipe:
         http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/164044
diff --git a/pep-0290.txt b/pep-0290.txt
index 6f0a4ff06a8..efb3c1bc918 100644
--- a/pep-0290.txt
+++ b/pep-0290.txt
@@ -452,7 +452,7 @@ References
 ==========
 
 .. [1] PEP 4, Deprecation of Standard Modules, von Loewis
-   (http://www.python.org/peps/pep-0004.html)
+   (http://www.python.org/dev/peps/pep-0004/)
 
 .. _PyChecker: http://pychecker.sourceforge.net/
 
diff --git a/pep-0298.txt b/pep-0298.txt
index 029931f2929..b9608d911a1 100644
--- a/pep-0298.txt
+++ b/pep-0298.txt
@@ -216,7 +216,7 @@ References
         http://mail.python.org/pipermail/python-dev/2000-October/009974.html
 
     [2] The Buffer Problem
-        http://www.python.org/peps/pep-0296.html
+        http://www.python.org/dev/peps/pep-0296/
 
 
 Copyright
diff --git a/pep-0301.txt b/pep-0301.txt
index a6a62cccefa..3b0b014e90e 100644
--- a/pep-0301.txt
+++ b/pep-0301.txt
@@ -365,10 +365,10 @@ References
    (http://pause.cpan.org/)
 
 .. [6] PEP 243, Module Repository Upload Mechanism
-   (http://www.python.org/peps/pep-0243.html)
+   (http://www.python.org/dev/peps/pep-0243/)
 
 .. [7] PEP 262, A Database of Installed Python Packages
-   (http://www.python.org/peps/pep-0262.html)
+   (http://www.python.org/dev/peps/pep-0262/)
 
 .. [8] [PEP243] upload status is bogus
    (http://mail.python.org/pipermail/distutils-sig/2001-March/002262.html)
diff --git a/pep-0302.txt b/pep-0302.txt
index a1e158ad91b..86e6f5df89f 100644
--- a/pep-0302.txt
+++ b/pep-0302.txt
@@ -553,7 +553,7 @@ References and Footnotes
     http://www.mcmillan-inc.com/install1.html
 
     [2] PEP 273, Import Modules from Zip Archives, Ahlstrom
-    http://www.python.org/peps/pep-0273.html
+    http://www.python.org/dev/peps/pep-0273/
 
     [3] The Freeze tool
     Tools/freeze/ in a Python source distribution
diff --git a/pep-0313.txt b/pep-0313.txt
index d58da350809..b5c64136dba 100644
--- a/pep-0313.txt
+++ b/pep-0313.txt
@@ -105,13 +105,13 @@ Compatibility Issues
 References
 
     [1] PEP 239, Adding a Rational Type to Python
-        http://www.python.org/peps/pep-0239.html
+        http://www.python.org/dev/peps/pep-0239/
 
     [2] PEP 240, Adding a Rational Literal to Python
-        http://www.python.org/peps/pep-0240.html
+        http://www.python.org/dev/peps/pep-0240/
 
     [3] PEP 8, Style Guide for Python Code
-        http://www.python.org/peps/pep-0008.html
+        http://www.python.org/dev/peps/pep-0008/
 
 
 Copyright
diff --git a/pep-0314.txt b/pep-0314.txt
index d5a6edf3d59..fd2ef69e9e5 100644
--- a/pep-0314.txt
+++ b/pep-0314.txt
@@ -300,7 +300,7 @@ References
         http://docutils.sourceforge.net/
 
     [2] PEP 301
-        http://www.python.org/peps/pep-0301.html
+        http://www.python.org/dev/peps/pep-0301/
 
 
 Copyright
diff --git a/pep-0317.txt b/pep-0317.txt
index 4f011db4db5..1015b66e580 100644
--- a/pep-0317.txt
+++ b/pep-0317.txt
@@ -434,16 +434,16 @@ References
        http://www.python.org/doc/essays/stdexceptions.html
 
 .. [2] "Guidelines for Language Evolution", Paul Prescod.
-       http://www.python.org/peps/pep-0005.html
+       http://www.python.org/dev/peps/pep-0005/
 
 .. [3] "Python Language Reference", Guido van Rossum.
        http://docs.python.org/reference/simple_stmts.html#raise
 
 .. [4] PEP 236 "Back to the __future__", Tim Peters.
-       http://www.python.org/peps/pep-0236.html
+       http://www.python.org/dev/peps/pep-0236/
 
 .. [5] PEP 230 "Warning Framework", Guido van Rossum.
-       http://www.python.org/peps/pep-0230.html
+       http://www.python.org/dev/peps/pep-0230/
 
 .. [6] Guido van Rossum, 11 June 2003 post to ``python-dev``.
        http://mail.python.org/pipermail/python-dev/2003-June/036176.html
diff --git a/pep-0323.txt b/pep-0323.txt
index 06e50a0976a..d463c6b14b5 100644
--- a/pep-0323.txt
+++ b/pep-0323.txt
@@ -466,7 +466,7 @@ References
         http://docs.python.org/library/copy.html
 
     [3] PEP 289, Generator Expressions, Hettinger
-        http://www.python.org/peps/pep-0289.html
+        http://www.python.org/dev/peps/pep-0289/
 
 Copyright
 
diff --git a/pep-0325.txt b/pep-0325.txt
index 749e21abf42..04b74b74ee9 100644
--- a/pep-0325.txt
+++ b/pep-0325.txt
@@ -266,10 +266,10 @@ Alternative Ideas
 References
 
     [1] PEP 255 Simple Generators
-        http://www.python.org/peps/pep-0255.html
+        http://www.python.org/dev/peps/pep-0255/
 
     [2] PEP 288 Generators Attributes and Exceptions
-        http://www.python.org/peps/pep-0288.html
+        http://www.python.org/dev/peps/pep-0288/
 
 
 Copyright
diff --git a/pep-0329.txt b/pep-0329.txt
index e6eb77d6137..364030f33e2 100644
--- a/pep-0329.txt
+++ b/pep-0329.txt
@@ -256,7 +256,7 @@ References
 ==========
 
 .. [1] Optimizing Global Variable/Attribute Access
-       http://www.python.org/peps/pep-0266.html
+       http://www.python.org/dev/peps/pep-0266/
 
 .. [2] ASPN Recipe for a non-private implementation
        http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/277940
diff --git a/pep-0331.txt b/pep-0331.txt
index f0ed1d6d249..3055f5e6de8 100644
--- a/pep-0331.txt
+++ b/pep-0331.txt
@@ -164,7 +164,7 @@ Implementation
 References
 
     [1] PEP 1, PEP Purpose and Guidelines, Warsaw, Hylton
-        http://www.python.org/peps/pep-0001.html
+        http://www.python.org/dev/peps/pep-0001/
 
     [2] Python locale documentation for embedding,
         http://docs.python.org/library/locale.html
diff --git a/pep-0334.txt b/pep-0334.txt
index 33118bab76c..d2bcc0d453a 100644
--- a/pep-0334.txt
+++ b/pep-0334.txt
@@ -382,7 +382,7 @@ References
    (http://c2.com/cgi/wiki?CallWithCurrentContinuation)
 
 .. [5] PEP 234, Iterators
-   (http://www.python.org/peps/pep-0234.html)
+   (http://www.python.org/dev/peps/pep-0234/)
 
 .. [6] Stackless Python
    (http://stackless.com)
@@ -391,7 +391,7 @@ References
    (http://www.sidhe.org/~dan/blog/archives/000178.html)
 
 .. [8] PEP 255, Simple Generators
-   (http://www.python.org/peps/pep-0255.html)
+   (http://www.python.org/dev/peps/pep-0255/)
 
 .. [9] itertools - Functions creating iterators
    (http://docs.python.org/library/itertools.html)
diff --git a/pep-0337.txt b/pep-0337.txt
index bd492173ae0..96209364fa8 100644
--- a/pep-0337.txt
+++ b/pep-0337.txt
@@ -171,7 +171,7 @@ Guidelines for Logging Usage
 References
 
     [1] PEP 282, A Logging System, Vinay Sajip, Trent Mick
-        http://www.python.org/peps/pep-0282.html
+        http://www.python.org/dev/peps/pep-0282/
 
     [2] http://mail.python.org/pipermail/python-dev/2004-October/049282.html
 
diff --git a/pep-0338.txt b/pep-0338.txt
index e916f60ea05..5ab2c9e8a19 100644
--- a/pep-0338.txt
+++ b/pep-0338.txt
@@ -306,7 +306,7 @@ References
 ==========
 
 .. [1] Special __main__() function in modules
-   (http://www.python.org/peps/pep-0299.html)
+   (http://www.python.org/dev/peps/pep-0299/)
 
 .. [2] PEP 338 implementation (runpy module and ``-m`` update)
    (http://www.python.org/sf/1429601)
@@ -315,7 +315,7 @@ References
    (http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/307772)
 
 .. [4] New import hooks
-   (http://www.python.org/peps/pep-0302.html)
+   (http://www.python.org/dev/peps/pep-0302/)
 
 .. [5] PEP 338 documentation (for runpy module)
    (http://www.python.org/sf/1429605)
diff --git a/pep-0340.txt b/pep-0340.txt
index da483e65352..b2a2ab2b53f 100644
--- a/pep-0340.txt
+++ b/pep-0340.txt
@@ -451,7 +451,7 @@ Examples
        Used as follows:
 
         block auto_retry(3, IOError):
-            f = urllib.urlopen("http://python.org/peps/pep-0340.html")
+            f = urllib.urlopen("http://www.python.org/dev/peps/pep-0340/")
             print f.read()
 
     5. It is possible to nest blocks and combine templates:
diff --git a/pep-0346.txt b/pep-0346.txt
index fa3ca3b1b35..56e5e986795 100644
--- a/pep-0346.txt
+++ b/pep-0346.txt
@@ -1264,22 +1264,22 @@ References
 ==========
 
 .. [1] Reliable Acquisition/Release Pairs
-   (http://www.python.org/peps/pep-0310.html)
+   (http://www.python.org/dev/peps/pep-0310/)
 
 .. [2] Anonymous block statements
-   (http://www.python.org/peps/pep-0340.html)
+   (http://www.python.org/dev/peps/pep-0340/)
 
 .. [3] Anonymous blocks, redux
-   (http://www.python.org/peps/pep-0343.html)
+   (http://www.python.org/dev/peps/pep-0343/)
 
 .. [4] Enhanced Iterators
-   (http://www.python.org/peps/pep-0342.html)
+   (http://www.python.org/dev/peps/pep-0342/)
 
 .. [5] Generator Attributes and Exceptions
-   (http://www.python.org/peps/pep-0288.html)
+   (http://www.python.org/dev/peps/pep-0288/)
 
 .. [6] Resource-Release Support for Generators
-   (http://www.python.org/peps/pep-0325.html)
+   (http://www.python.org/dev/peps/pep-0325/)
 
 .. [7] A rant against flow control macros
    (http://blogs.msdn.com/oldnewthing/archive/2005/01/06/347666.aspx)
diff --git a/pep-0348.txt b/pep-0348.txt
index 6bccf96bb37..e7e5d53adcb 100644
--- a/pep-0348.txt
+++ b/pep-0348.txt
@@ -447,13 +447,13 @@ References
 ==========
 
 .. [#PEP342] PEP 342 (Coroutines via Enhanced Generators)
-   http://www.python.org/peps/pep-0342.html
+   http://www.python.org/dev/peps/pep-0342/
 
 .. [#PEP344] PEP 344 (Exception Chaining and Embedded Tracebacks)
-   http://www.python.org/peps/pep-0344.html
+   http://www.python.org/dev/peps/pep-0344/
 
 .. [#PEP290] PEP 290 (Code Migration and Modernization)
-   http://www.python.org/peps/pep-0290.html
+   http://www.python.org/dev/peps/pep-0290/
 
 .. [#Summary2004-08-01] python-dev Summary (An exception is an
    exception, unless it doesn't inherit from Exception)
@@ -505,7 +505,7 @@ References
    http://mail.python.org/pipermail/python-dev/2005-August/055423.html
 
 .. [#zen] PEP 20 (The Zen of Python)
-   http://www.python.org/peps/pep-0020.html
+   http://www.python.org/dev/peps/pep-0020/
 
 .. [#tutorial] Python Tutorial
    http://docs.python.org/tutorial/
diff --git a/pep-0352.txt b/pep-0352.txt
index a1decaf0539..3f1931bace7 100644
--- a/pep-0352.txt
+++ b/pep-0352.txt
@@ -283,7 +283,7 @@ References
 ==========
 
 .. [#pep348] PEP 348 (Exception Reorganization for Python 3.0)
-   http://www.python.org/peps/pep-0348.html
+   http://www.python.org/dev/peps/pep-0348/
 
 .. [#hierarchy-good] python-dev Summary for 2004-08-01 through 2004-08-15
    http://www.python.org/dev/summary/2004-08-01_2004-08-15.html#an-exception-is-an-exception-unless-it-doesn-t-inherit-from-exception
diff --git a/pep-0666.txt b/pep-0666.txt
index 9896f1b5331..e533f53e768 100644
--- a/pep-0666.txt
+++ b/pep-0666.txt
@@ -82,7 +82,7 @@ Rationale
 References
 
     [1] PEP 1, PEP Purpose and Guidelines
-        http://www.python.org/peps/pep-0001.html
+        http://www.python.org/dev/peps/pep-0001/
 
     [2] Tim Peters already has (private correspondence).  My early 2.2 
         didn't have a __getattribute__, and __getattr__ was
diff --git a/pep-3126.txt b/pep-3126.txt
index 07afdf5f25f..18c167c98a0 100644
--- a/pep-3126.txt
+++ b/pep-3126.txt
@@ -353,7 +353,7 @@ References
     http://mail.python.org/pipermail/python-3000/2007-April/006563.html
 
 ..  [#PEP3101] PEP 3101, Advanced String Formatting, Talin
-    http://www.python.org/peps/pep-3101.html
+    http://www.python.org/dev/peps/pep-3101/
 
 ..  [#elimpercent] ps to question Re: Need help completing ABC pep,
     van Rossum