diff --git a/pep-0443.txt b/pep-0443.txt
index 6feeceabc..3fcf99302 100644
--- a/pep-0443.txt
+++ b/pep-0443.txt
@@ -2,7 +2,7 @@ PEP: 443
 Title: Single-dispatch generic functions
 Version: $Revision$
 Last-Modified: $Date$
-Author: Łukasz Langa <lukasz@langa.pl>
+Author: Łukasz Langa <lukasz@python.org>
 Discussions-To: Python-Dev <python-dev@python.org>
 Status: Final
 Type: Standards Track
@@ -420,5 +420,3 @@ This document has been placed in the public domain.
    fill-column: 70
    coding: utf-8
    End:
-
-
diff --git a/pep-0482.txt b/pep-0482.txt
index ca9cb9b3e..c5ad12eb3 100644
--- a/pep-0482.txt
+++ b/pep-0482.txt
@@ -2,7 +2,7 @@ PEP: 482
 Title: Literature Overview for Type Hints
 Version: $Revision$
 Last-Modified: $Date$
-Author: Łukasz Langa <lukasz@langa.pl>
+Author: Łukasz Langa <lukasz@python.org>
 Discussions-To: Python-Ideas <python-ideas@python.org>
 Status: Draft
 Type: Informational
diff --git a/pep-0484.txt b/pep-0484.txt
index bbf3bec67..43684d436 100644
--- a/pep-0484.txt
+++ b/pep-0484.txt
@@ -2,7 +2,7 @@ PEP: 484
 Title: Type Hints
 Version: $Revision$
 Last-Modified: $Date$
-Author: Guido van Rossum <guido@python.org>, Jukka Lehtosalo <jukka.lehtosalo@iki.fi>, Łukasz Langa <lukasz@langa.pl>
+Author: Guido van Rossum <guido@python.org>, Jukka Lehtosalo <jukka.lehtosalo@iki.fi>, Łukasz Langa <lukasz@python.org>
 BDFL-Delegate: Mark Shannon
 Discussions-To: Python-Dev <python-dev@python.org>
 Status: Accepted
diff --git a/pep-0541.txt b/pep-0541.txt
index c2f2c976f..d45b6265d 100644
--- a/pep-0541.txt
+++ b/pep-0541.txt
@@ -2,7 +2,7 @@ PEP: 541
 Title: Package Index Name Retention
 Version: $Revision$
 Last-Modified: $Date$
-Author: Łukasz Langa <lukasz@langa.pl>
+Author: Łukasz Langa <lukasz@python.org>
 BDFL-Delegate: Donald Stufft <donald@stufft.io>
 Discussions-To: distutils-sig <distutils-sig@python.org>
 Status: Draft
diff --git a/pep-0544.txt b/pep-0544.txt
index b4e22a988..8c5daa01c 100644
--- a/pep-0544.txt
+++ b/pep-0544.txt
@@ -2,7 +2,7 @@ PEP: 544
 Title: Protocols: Structural subtyping (static duck typing)
 Version: $Revision$
 Last-Modified: $Date$
-Author: Ivan Levkivskyi <levkivskyi@gmail.com>, Jukka Lehtosalo <jukka.lehtosalo@iki.fi>, Łukasz Langa <lukasz@langa.pl>
+Author: Ivan Levkivskyi <levkivskyi@gmail.com>, Jukka Lehtosalo <jukka.lehtosalo@iki.fi>, Łukasz Langa <lukasz@python.org>
 Discussions-To: Python-Dev <python-dev@python.org>
 Status: Draft
 Type: Standards Track
diff --git a/pep-0563.rst b/pep-0563.rst
index 771e64cc9..561bb4bcf 100644
--- a/pep-0563.rst
+++ b/pep-0563.rst
@@ -2,7 +2,7 @@ PEP: 563
 Title: Postponed Evaluation of Annotations
 Version: $Revision$
 Last-Modified: $Date$
-Author: Łukasz Langa <lukasz@langa.pl>
+Author: Łukasz Langa <lukasz@python.org>
 Discussions-To: Python-Dev <python-dev@python.org>
 Status: Accepted
 Type: Standards Track