diff --git a/.gitignore b/.gitignore
index 4d66c82..f8f74ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,7 @@ publish
 
 # PyDev
 .pydevproject
+
+# pbr
+AUTHORS
+ChangeLog
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..6a6d090
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Przemysław Gajda <quermit@gmail.com> <quermit@gmail.com>