diff --git a/.gitignore b/.gitignore
index 8336eb16..b60da2b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@ demo/var
 *.egg-info
 # Documentation builds
 docs/build/
+
+# Ignore setup.py-generated directories
+./build/
+./dist/
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index dd9fe866..9b3112bb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,7 @@ master (unreleased)
 
 * Renamed exception class for unknown access (#166)
 * Added str() methods to models (#167)
+* Added ``build/`` and ``dist/`` directories to ``.gitignore`` (#174)
 
 Release 0.6.0 (2017-01-17)
 ==========================