diff --git a/lib/PAUSE.pm b/lib/PAUSE.pm
index d46dd69d4..74d199c75 100644
--- a/lib/PAUSE.pm
+++ b/lib/PAUSE.pm
@@ -118,7 +118,7 @@ $PAUSE::Config ||=
      TIMEOUT => 60*60,
      TRUST_IS_SSL_HEADER => 1,
      TMP => '/data/pause/tmp/',
-     UPLOAD => 'upload@pause.perl.org',
+     UPLOAD => 'modules@perl.org',
      # sign the auto-generated CHECKSUM files with:
      CHECKSUMS_SIGNING_PROGRAM => 'gpg',
      CHECKSUMS_SIGNING_ARGS => '-q --homedir /home/pause/pause-private/gnupg-pause-batch-signing-home --clearsign --default-key ',
diff --git a/lib/pause_2017/templates/user/distperms/remove_dist_primary.html.ep b/lib/pause_2017/templates/user/distperms/remove_dist_primary.html.ep
index 670c18667..ad331de73 100644
--- a/lib/pause_2017/templates/user/distperms/remove_dist_primary.html.ep
+++ b/lib/pause_2017/templates/user/distperms/remove_dist_primary.html.ep
@@ -48,7 +48,7 @@ to one of the other owners.</p>
 
 <p class="notice">
 If you have are unsure about what to do, or have any questions,
-please email the PAUSE admins at <a href="mailto:modules@cpan.org">modules@cpan.org</a>.
+please email the PAUSE admins at <a href="mailto:modules@perl.org">modules@perl.org</a>.
 </p>
 
 <p class="notice">If you need finer control (eg. to give up only a small part of
diff --git a/lib/pause_2017/templates/user/perms/remove_primary.html.ep b/lib/pause_2017/templates/user/perms/remove_primary.html.ep
index 778a7cd0a..8137c1ccf 100644
--- a/lib/pause_2017/templates/user/perms/remove_primary.html.ep
+++ b/lib/pause_2017/templates/user/perms/remove_primary.html.ep
@@ -45,7 +45,7 @@ to one of the other owners.</p>
 
 <p class="notice">
 If you have are unsure about what to do, or have any questions,
-please email the PAUSE admins at <a href="mailto:modules@cpan.org">modules@cpan.org</a>.
+please email the PAUSE admins at <a href="mailto:modules@perl.org">modules@perl.org</a>.
 </p>
 
 <p class="notice">If you want to give up all the modules in a distribution, visit