diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 1015fc443..ef6066fbe 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -63,7 +63,7 @@ When using the OpenStreetMap Carto spaces you should act in the spirit of the va
 
 The OpenStreetMap Carto maintainers are responsible for handling conduct-related issues. Their goal is to de-escalate conflicts and try to resolve issues to the satisfaction of all parties.
 
-If you encounter a conduct-related issue, you should report it to the maintainers by sending them [all an email](mailto:openstreetmap-carto@gravitystorm.co.uk,osm@paulnorman.ca,chris_hormann@gmx.de,daniel@xn--ko-wla.pl,sommerluk@gmail.com,joseph.eisenberg@gmail.com). In the event that you wish to make a complaint against a maintainer, you may instead contact the other maintainers.
+If you encounter a conduct-related issue, you should report it to the maintainers by sending them [all an email](mailto:openstreetmap-carto@gravitystorm.co.uk,chris_hormann@gmx.de,daniel@xn--ko-wla.pl,sommerluk@gmail.com,joseph.eisenberg@gmail.com). In the event that you wish to make a complaint against a maintainer, you may instead contact the other maintainers.
 
 **Note that the goal of the Code of Conduct and the maintainers is to resolve conflicts in the most harmonious way possible.** We hope that in most cases issues may be resolved through polite discussion and mutual agreement. Bans and other forceful measures are to be employed only as a last resort.
 
diff --git a/README.md b/README.md
index e2b9a282c..e1586199f 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,6 @@ maps using Mapnik, many based on this project. Some alternatives are:
 # Maintainers
 
 * Andy Allan [@gravitystorm](https://github.com/gravitystorm)
-* Paul Norman [@pnorman](https://github.com/pnorman)
 * Daniel Koć [@kocio-pl](https://github.com/kocio-pl)
 * Christoph Hormann [@imagico](https://github.com/imagico)
 * Lukas Sommer [@sommerluk](https://github.com/sommerluk)
@@ -97,6 +96,7 @@ maps using Mapnik, many based on this project. Some alternatives are:
 
 ## Previous maintainers
 
+* Paul Norman [@pnorman](https://github.com/pnorman)
 * Michael Glanznig [@nebulon42](https://github.com/nebulon42)
 * Matthijs Melissen [@matthijsmelissen](https://github.com/matthijsmelissen)
 * Mateusz Konieczny [@matkoniecz](https://github.com/matkoniecz)