diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..91ff5537c2d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+James Yonan <james@openvpn.net>      james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
diff --git a/.svncommitters b/.svncommitters
new file mode 100644
index 00000000000..0772102d2b8
--- /dev/null
+++ b/.svncommitters
@@ -0,0 +1 @@
+james = James Yonan <james@openvpn.net>