diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70b4d816..db7baf43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,17 @@
 All enhancements and patches to cookiecutter-django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2015-11-18]
+### Added
+- Mailhog as a replacement for Maildump
+
+### Removed
+- Maildump because it didn't support Python 3
+
 ## [2015-11-17]
 ### Added
 - initial configuration to support opbeat (@burhan)
+
 ### Removed
 - Took *.pyc out of .gitignore, because it's already covered by *.py[cod] (@audreyr)
 
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 8505d255..f6c57041 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -64,6 +64,7 @@ Code Contributors
 * Garry Polley / @garrypolley
 * Théo Segonds / show0k
 * Cristian Vargas / @cdvv7788
+* Tom Atkins / @keybits
 
 \* Possesses commit rights