diff --git a/Changes.old b/Changes.old
index 353fabd3d..2b3ae642b 100644
--- a/Changes.old
+++ b/Changes.old
@@ -19913,7 +19913,7 @@ Guillem Jover <guillem@hadrons.org>
 Jianhua Li <jhlicc@gmail.com>
 Linus Nilsson <lajnold@gmail.com>
 Lenaic Huard <lenaic.huard@laposte.net>
-mac@mcrowe.com
+Mac <mac@mcrowe.com>
 Martin Schulze <joey@infodrom.org>
 Maxin John <maxin.john@gmail.com>
 Michael Kerrisk <mtk.manpages@gmail.com>
@@ -20056,7 +20056,7 @@ Contributors
 The following people contributed notes, ideas, or patches that have
 been incorporated in changes in this release:
 
-caishuxian@gmail.com
+caishuxian <caishuxian@gmail.com>
 Denis Barbier <bouzim@gmail.com>
 Denis Silakov <silakov@ispras.ru>
 der Mouse <mouse@rodents-montreal.org>
@@ -20499,7 +20499,6 @@ random.3
 readdir.3
     Michael Kerrisk
         Clarify that "positive error numbers" are listed in ERRORS
-            Reported-by fkater@googlemail.com
 
 rexec.3
     Michael Kerrisk
@@ -22441,7 +22440,7 @@ Pat Pannuto <pat.pannuto@gmail.com>
 Salvo Tomaselli <tiposchi@tiscali.it>
 Simone Piccardi <piccardi@truelite.it>
 Slaven Rezic <srezic@iconmobile.com>
-starlight@binnacle.cx
+starlight <starlight@binnacle.cx>
 Stephan Mueller <stephan.mueller@atsec.com>
 Vijay Rao <vijay@portuosus.com>
 Walter Haidinger <walter.haidinger@gmx.at>
@@ -22547,16 +22546,16 @@ sync.2
         PROTOTYPE: Fix return type of syncfs()
 
 vfork.2
-    Michael Kerrisk  [starlight@binnacle.cx]
+    Michael Kerrisk  [starlight]
         Clarify what is duplicated in the child
             Add some words to make it clear to the reader that vfork(),
             like fork(), creates duplicates of process attributes
             in the child.
     Michael Kerrisk
         Note clone() flags equivalent to vfork()
-    Michael Kerrisk  [starlight@binnacle.cx, Mike Frysinger]
+    Michael Kerrisk  [starlight, Mike Frysinger]
         Add some notes on reasons why vfork() still exists
-    Michael Kerrisk  [starlight@binnacle.cx]
+    Michael Kerrisk  [starlight]
         Clarify that calling *thread* is suspended during vfork()
     Michael Kerrisk
         CONFORMING TO: Note that POSIX.1-2001 marked vfork() obsolete
@@ -23701,7 +23700,7 @@ io_submit.2
             Rewrite to focus on the system call interface, adding
             some notes on the libaio wrapper differences.
             See the following mail:
-            2012-05-07 "aio manuals", linux-man@vger.kernel.org
+            2012-05-07 "aio manuals", linux-man@vger
             http://thread.gmane.org/gmane.linux.man/1935/focus=2910
 
             Other minor rewrites.
@@ -23923,7 +23922,7 @@ mmap64.3
             Upstreamed from Red Hat / Fedora
 
 realpath.3
-    Michael Kerrisk  [Casper.Dik@oracle.com]
+    Michael Kerrisk  [Casper Dik]
         Remove note about Solaris possibly returning a relative path
 
 syslog.3
@@ -27317,8 +27316,8 @@ Chuck Coffing <clc@alum.mit.edu>
 David Prévot <taffit@debian.org>
 Denys Vlasenko <dvlasenk@redhat.com>
 Dmitry V. Levin <ldv@altlinux.org>
-Felix_Schulte@McAfee.com
-graud@gmx.com
+Felix Schulte <Felix_Schulte@McAfee.com>
+Graud <graud@gmx.com>
 Michael Kerrisk <mtk.manpages@gmail.com>
 Oleg Nesterov <oleg@redhat.com>
 Peng Haitao <penght@cn.fujitsu.com>
@@ -27428,7 +27427,7 @@ readlink.2
             cause the program to operate on uninitialized data.
 
 setpgid.2
-    Michael Kerrisk  [graud@gmx.com]
+    Michael Kerrisk  [Graud]
         s/SIGTSTP/SIGTTIN/ when discussing reads from terminal
             See https://bugzilla.kernel.org/show_bug.cgi?id=60504
 
@@ -27489,7 +27488,7 @@ capabilities.7
         Add open_by_handle_at(2) under CAP_DAC_READ_SEARCH
 
 inotify.7
-    Michael Kerrisk  [Felix_Schulte@McAfee.com]
+    Michael Kerrisk  [Felix Schulte]
         Clarify description of IN_MOVED_FROM and IN_MOVED_TO
 
 man-pages.7