diff --git a/Doc/lib/libcursespanel.tex b/Doc/lib/libcursespanel.tex
index 2b1203bf344..519091ebb4c 100644
--- a/Doc/lib/libcursespanel.tex
+++ b/Doc/lib/libcursespanel.tex
@@ -2,7 +2,7 @@
          A panel stack extension for curses.}
 
 \declaremodule{standard}{curses.panel}
-\sectionauthor{A.M. Kuchling}{akuchlin@mems-exchange.org}
+\sectionauthor{A.M. Kuchling}{amk@amk.ca}
 \modulesynopsis{A panel stack extension that adds depth to 
                 curses windows.}
 
diff --git a/Doc/lib/libre.tex b/Doc/lib/libre.tex
index 3dab1c40ed1..b8aeb40c8b3 100644
--- a/Doc/lib/libre.tex
+++ b/Doc/lib/libre.tex
@@ -2,7 +2,7 @@
          Regular expression operations}
 \declaremodule{standard}{re}
 \moduleauthor{Fredrik Lundh}{fredrik@pythonware.com}
-\sectionauthor{Andrew M. Kuchling}{akuchlin@mems-exchange.org}
+\sectionauthor{Andrew M. Kuchling}{amk@amk.ca}
 
 
 \modulesynopsis{Regular expression search and match operations with a
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 8d7c3d02670..536144684c0 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -8,8 +8,7 @@
  *   Version 1.5b1, heavily extended for ncurses by Oliver Andrich:
  *   Copyright 1996,1997 by Oliver Andrich, Koblenz, Germany.
  *
- *   Tidied for Python 1.6, and currently maintained by
- *   <akuchlin@mems-exchange.org>.
+ *   Tidied for Python 1.6, and currently maintained by <amk@amk.ca>.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining
  *   a copy of this source file to use, copy, modify, merge, or publish it
diff --git a/Modules/shamodule.c b/Modules/shamodule.c
index 5b9040d9a67..1b3b76a09fd 100644
--- a/Modules/shamodule.c
+++ b/Modules/shamodule.c
@@ -5,7 +5,7 @@
 /* See below for information about the original code this module was
    based upon. Additional work performed by:
 
-   Andrew Kuchling (akuchlin@mems-exchange.org)
+   Andrew Kuchling (amk@amk.ca)
    Greg Stein (gstein@lyra.org)
 */