diff --git a/libs/maintainers.txt b/libs/maintainers.txt
index c35c50121b..3f1fedf723 100644
--- a/libs/maintainers.txt
+++ b/libs/maintainers.txt
@@ -22,7 +22,7 @@ assign                Thorsten Ottosen <nesotto -at- cs.auc.dk>
 atomic                Helge Bahmann <hcb -at- chaoticmind.net>, Tim Blechmann <tim -at- klingt.org>, Andrey Semashev <andrey.semashev -at- gmail.com>
 beast                 Vinnie Falco <vinnie.falco@gmail.com>
 bimap                 Matias Capeletto <matias.capeletto -at- gmail.com>
-bind                  Peter Dimov <pdimov -at- pdimov.com>
+bind                  Peter Dimov <pdimov -at- gmail.com>
 callable_traits       Barrett Adair <barrettellisadair -at- gmail.com>
 chrono                Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>
 chrono/stopwatch      Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>
@@ -35,7 +35,7 @@ context               Oliver Kowalke <oliver.kowalke -at- gmail.com>
 contract              Lorenzo Caminiti <lorcaminiti -at- gmail.com>
 conversion            Antony Polukhin <antoshkka -at- gmail.com>
 convert               Vladimir Batov <vbmail247 -at- gmail.com>
-core                  Peter Dimov <pdimov -at- pdimov.com>, Glen Fernandes <glenjofe -at- gmail.com>, Andrey Semashev <andrey.semashev -at- gmail.com>
+core                  Peter Dimov <pdimov -at- gmail.com>, Glen Fernandes <glenjofe -at- gmail.com>, Andrey Semashev <andrey.semashev -at- gmail.com>
 coroutine             Oliver Kowalke <oliver.kowalke -at- gmail.com>
 coroutine2            Oliver Kowalke <oliver.kowalke -at- gmail.com>
 crc                   Daryle Walker <darylew -at- hotmail.com>
@@ -51,7 +51,7 @@ filesystem            Beman Dawes <bdawes -at- acm.org>, Andrey Semashev <andrey
 flyweight             Joaquin M Lopez Munoz <joaquin.lopezmunoz -at- gmail.com>
 foreach               Eric Niebler <eric -at- boostpro.com>
 format                Samuel Krempp <krempp -at- crans.ens-cachan.fr>, James E. King III <jking -at- apache.org>
-function              Peter Dimov <pdimov -at- pdimov.com>
+function              Peter Dimov <pdimov -at- gmail.com>
 function_types        Tobias Schwinger <tschwinger -at- isonews2.com>
 functional
 functional/factory    Glen Fernandes <glenjofe -at- gmail.com>, Tobias Schwinger <tschwinger -at- isonews2.com>
@@ -89,7 +89,7 @@ logic                 Douglas Gregor <dgregor -at- cs.indiana.edu>
 math                  Hubert Holin <Hubert.Holin -at- meteo.fr>, John Maddock <john -at- johnmaddock.co.uk>
 metaparse             Abel Sinkovics <abel -at- elte.hu>
 move                  Ion Gaztanaga <igaztanaga -at- gmail.com>
-mp11                  Peter Dimov <pdimov -at- pdimov.com>
+mp11                  Peter Dimov <pdimov -at- gmail.com>
 mpi                   K. Noel Belcourt <kbelco -at- sandia.gov>, Alain Miniussi <alain.miniussi -at- oca.eu>
 mpl                   Aleksey Gurtovoy <agurtovoy -at- meta-comm.com>
 msm                   Christophe Henry <christophe.j.henry -at-  googlemail.com>
@@ -131,7 +131,7 @@ scope_exit            Alexander Nasonov <alexander.nasonov -at- gmail.com>, Lore
 serialization         Robert Ramey <ramey -at- rrsd.com>
 signals               Douglas Gregor <dgregor -at- cs.indiana.edu>
 signals2              Frank Mori Hess <fmhess -at- users.sourceforge.net>
-smart_ptr             Peter Dimov <pdimov -at- pdimov.com>
+smart_ptr             Peter Dimov <pdimov -at- gmail.com>
 smart_ptr/make_shared Glen Fernandes <glenjofe -at- gmail.com>
 sort                  Steven Ross <spreadsort -at- gmail.com>
 spirit                Joel de Guzman <joel -at- boost-consulting.com>, Hartmut Kaiser <hartmut.kaiser -at- gmail.com>
@@ -144,8 +144,8 @@ static_string         Krystian Stasiowski <sdkrystian@gmail.com>, Vinnie Falco <
 stl_interfaces        Zach Laine <whatwasthataddress -at- gmail.com>
 test                  Gennadiy Rozental <rogeeff -at- gmail.com>, Raffi Enficiaud <raffi.enficiaud -at- free.fr>
 thread                Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>
-throw_exception       Emil Dotchevski <emil -at- revergestudios.com>, Peter Dimov <pdimov -at- pdimov.com>
-timer                 Beman Dawes <bdawes -at- acm.org>
+throw_exception       Emil Dotchevski <emil -at- revergestudios.com>, Peter Dimov <pdimov -at- gmail.com>
+timer                 Peter Dimov <pdimov -at- gmail.com>
 tokenizer             John R. Bandela <jbandela -at- ufl.edu>
 tr1                   John Maddock <john -at- johnmaddock.co.uk>
 tti                   Edward Diener <eld -at- tropicsoft.com>
@@ -165,7 +165,7 @@ utility/string_ref    Marshall Clow <marshall -at- idio.com>
 utility/swap          Joseph Gauterin <joseph.gauterin -at- googlemail.com>
 uuid                  Andy Tompkins <atompkins -at- fastmail.fm>, James E. King III <jking -at- apache.org>
 variant               Antony Polukhin <antoshkka -at- gmail.com>, Eric Friedman <ericbrandon -at- gmail.com>
-variant2              Peter Dimov <pdimov -at- pdimov.com>
+variant2              Peter Dimov <pdimov -at- gmail.com>
 vmd                   Edward Diener <eld -at- tropicsoft.com>
 wave                  Hartmut Kaiser <hartmut.kaiser -at- gmail.com>
 winapi                Andrey Semashev <andrey.semashev -at- gmail.com>