diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c1b68de..cae0765c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All enhancements and patches to cookiecutter-django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2015-1-6]
+### Changed
+- Use Postgres 9.5 on docker (@jayfk)
+
 ## [2015-1-4]
 ### Added
 - Add Tether.js because [is needed](http://v4-alpha.getbootstrap.com/components/tooltips/#overview) for proper positioning of Bootstrap tooltips (@EricZaporzan)
diff --git a/{{cookiecutter.repo_name}}/dev.yml b/{{cookiecutter.repo_name}}/dev.yml
index d50959d2..d018f7cd 100644
--- a/{{cookiecutter.repo_name}}/dev.yml
+++ b/{{cookiecutter.repo_name}}/dev.yml
@@ -1,5 +1,5 @@
 postgres:
-  image: postgres
+  image: postgres:9.5
   volumes:
     # If you are using boot2docker, postgres data has to live in the VM for now until #581 is fixed
     # for more info see here: https://github.com/boot2docker/boot2docker/issues/581
diff --git a/{{cookiecutter.repo_name}}/docker-compose.yml b/{{cookiecutter.repo_name}}/docker-compose.yml
index 01f5d68b..dc681037 100644
--- a/{{cookiecutter.repo_name}}/docker-compose.yml
+++ b/{{cookiecutter.repo_name}}/docker-compose.yml
@@ -1,5 +1,5 @@
 postgres:
-  image: postgres:9.4
+  image: postgres:9.5
   volumes:
     - /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data
   env_file: .env
@@ -40,4 +40,4 @@ celerybeat:
     - postgres
     - redis
   command: celery -A {{cookiecutter.repo_name}}.taskapp beat -l INFO
-{% endif %}
\ No newline at end of file
+{% endif %}