diff --git a/.mailmap b/.mailmap
index bd6360a2af..7919eed502 100644
--- a/.mailmap
+++ b/.mailmap
@@ -93,3 +93,4 @@ Nathan LeClaire <nathan.leclaire@docker.com> <nathanleclaire@gmail.com>
 <marc@marc-abramowitz.com> <msabramo@gmail.com>
 Matthew Heon <mheon@redhat.com> <mheon@mheonlaptop.redhat.com>
 <bernat@luffy.cx> <vincent@bernat.im>
+<p@pwaller.net> <peter@scraperwiki.com>
diff --git a/AUTHORS b/AUTHORS
index c17120cec5..6f88355e18 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -421,7 +421,7 @@ Paul Nasrat <pnasrat@gmail.com>
 Paul <paul9869@gmail.com>
 Paul Weaver <pauweave@cisco.com>
 Peter Braden <peterbraden@peterbraden.co.uk>
-Peter Waller <peter@scraperwiki.com>
+Peter Waller <p@pwaller.net>
 Phillip Alexander <git@phillipalexander.io>
 Phil Spitler <pspitler@gmail.com>
 Phil <underscorephil@gmail.com>