diff --git a/README.rst b/README.rst
index 14dcf2078..df192efc0 100644
--- a/README.rst
+++ b/README.rst
@@ -14,9 +14,11 @@ Cookiecutter Django
 
 Powered by Cookiecutter_, Cookiecutter Django is a framework for jumpstarting production-ready Django projects quickly.
 
+See Troubleshooting_ for common errors and obstacles.
+
 .. _cookiecutter: https://github.com/audreyr/cookiecutter
 
-**Warning**: if you get the error "jinja2.exceptions.TemplateSyntaxError: Encountered unknown tag 'now'." , please upgrade your cookiecutter version to >= 1.4 (see issue # 528_ )
+.. _Troubleshooting: https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html
 
 .. _528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373
 
@@ -99,8 +101,6 @@ You'll be prompted for some values. Provide them, then a Django project will be
 
 **Warning**: After this point, change 'Daniel Greenfeld', 'pydanny', etc to your own information.
 
-**Warning**: project_slug must be a valid Python module name or you will have issues on imports.
-
 Answer the prompts with your own desired options_. For example::
 
     Cloning into 'cookiecutter-django'...
diff --git a/docs/index.rst b/docs/index.rst
index beafb44cf..aa88fe246 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -25,6 +25,7 @@ Contents:
    deployment-on-heroku
    deployment-with-docker
    faq
+   troubleshooting
 
 Indices and tables
 ==================
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
new file mode 100644
index 000000000..fe121b9cd
--- /dev/null
+++ b/docs/troubleshooting.rst
@@ -0,0 +1,9 @@
+Troubleshooting
+=====================================
+
+This page contains some advice about errors and problems commonly encountered during the development of Cookiecutter Django applications.
+
+#. If you get the error ``jinja2.exceptions.TemplateSyntaxError: Encountered unknown tag 'now'.`` , please upgrade your cookiecutter version to >= 1.4 (see issue # 528_ )
+#. ``project_slug`` must be a valid Python module name or you will have issues on imports.
+
+.. _528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373
\ No newline at end of file