diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70a142fc..97340657 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-12-28]
+### Changed
+- Upgraded to Django 1.11 (@pydanny)
+
 ## [2015-10-08]
 ### Changed
 - Elastic Beanstalk: Added --noinput to migrate command (@MightySCollins )
diff --git a/README.rst b/README.rst
index 589f1c92..838253f4 100644
--- a/README.rst
+++ b/README.rst
@@ -34,8 +34,8 @@ production-ready Django projects quickly.
 Features
 ---------
 
-* For Django 1.10
-* Works with Python 3.4.x or 3.5.x. Python 3.6 is experimental
+* For Django 1.11
+* Works with Python 3.6
 * Renders Django projects with 100% starting test coverage
 * Twitter Bootstrap_ v4.0.0 - beta 1 (`maintained Foundation fork`_ also available)
 * 12-Factor_ based settings via django-environ_
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 00e86bf4..369d8464 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -5,8 +5,8 @@
 wheel==0.30.0
 
 
-# Bleeding edge Django
-django==1.10.8 # pyup: >=1.10,<1.11
+# Conservative Django
+django==1.11.8 # pyup: <2.0
 
 # Configuration
 django-environ==0.4.4