diff --git a/.mailmap b/.mailmap
index 4bfce543f9c..fb35e30c6ab 100644
--- a/.mailmap
+++ b/.mailmap
@@ -92,8 +92,8 @@ Chad Versace <chad.versace@intel.com> <chad@chad-versace.us>
 Chad Versace <chad.versace@intel.com> <Chad Versace chad@chad-versace.us>
 Chad Versace <chad.versace@intel.com> <chad.versace@linux.intel.com>
 
-Chia-I Wu <olv@lunarg.com> <olvaffe@gmail.com>
-Chia-I Wu <olv@lunarg.com> Chia-Wu <olvaffe@gmail.com>
+Chia-I Wu <olvaffe@gmail.com> <olv@lunarg.com>
+Chia-I Wu <olvaffe@gmail.com> Chia-Wu <olvaffe@gmail.com>
 
 Chih-Wei Huang <cwhuang@linux.org.tw> Chih-Wei Huang <cwhuang@android-x86.org>