diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..07d8d50
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Ian Stapleton Cordasco <graffatcolmingov@gmail.com> Ian Cordasco <graffatcolmingov@gmail.com>
+Ian Stapleton Cordasco <graffatcolmingov@gmail.com> Ian Cordasco <sigmavirus24@users.noreply.github.com>
+Ian Stapleton Cordasco <graffatcolmingov@gmail.com> Ian Cordasco <ian.cordasco@rackspace.com>
+Ian Stapleton Cordasco <graffatcolmingov@gmail.com> Ian Cordasco <icordasc+bitbucket@coglib.com>
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0c0b8de..355e6ff 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -54,8 +54,8 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'flake8'
-copyright = u'2016, Ian Cordasco'
-author = u'Ian Cordasco'
+copyright = u'2016, Ian Stapleton Cordasco'
+author = u'Ian Stapleton Cordasco'
 
 import flake8
 # The version info for the project you're documenting, acts as replacement for
@@ -235,7 +235,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'flake8.tex', u'flake8 Documentation',
-     u'Ian Cordasco', 'manual'),
+     u'Ian Stapleton Cordasco', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/docs/source/internal/contributing.rst b/docs/source/internal/contributing.rst
index 80ff9ac..023a553 100644
--- a/docs/source/internal/contributing.rst
+++ b/docs/source/internal/contributing.rst
@@ -19,8 +19,8 @@ Code of Conduct
 ===============
 
 |Flake8| adheres to the `Python Code Quality Authority's Code of Conduct`_.
-Any violations of the Code of Conduct should be reported to Ian Cordasco
-(graffatcolmingov [at] gmail [dot] com).
+Any violations of the Code of Conduct should be reported to Ian Stapleton
+Cordasco (graffatcolmingov [at] gmail [dot] com).
 
 
 Setting Up A Development Environment
diff --git a/setup.py b/setup.py
index 7606633..de350a8 100644
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ setuptools.setup(
     long_description=get_long_description(),
     author="Tarek Ziade",
     author_email="tarek@ziade.org",
-    maintainer="Ian Cordasco",
+    maintainer="Ian Stapleton Cordasco",
     maintainer_email="graffatcolmingov@gmail.com",
     url="https://gitlab.com/pycqa/flake8",
     package_dir={"": "src"},