diff --git a/docs/index.rst b/docs/index.rst
index 43702409..617104ee 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,11 +21,11 @@ engine and the `Werkzeug`_ WSGI toolkit.  These libraries are not documented
 here.  If you want to dive into their documentation, check out the
 following links:
 
--   `Jinja2 Documentation <http://jinja.pocoo.org/2/documentation/>`_
--   `Werkzeug Documentation <http://werkzeug.pocoo.org/documentation/>`_
+-   `Jinja2 Documentation <http://jinja.pocoo.org/docs>`_
+-   `Werkzeug Documentation <http://werkzeug.pocoo.org/docs>`_
 
 
-.. _Jinja2: http://jinja.pocoo.org/2/
+.. _Jinja2: http://jinja.pocoo.org/
 .. _Werkzeug: http://werkzeug.pocoo.org/
 
 .. include:: contents.rst.inc
diff --git a/docs/installation.rst b/docs/installation.rst
index 78f192fd..163782f2 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -4,7 +4,7 @@ Installation
 ============
 
 Flask depends on some external libraries, like `Werkzeug
-<http://werkzeug.pocoo.org/>`_ and `Jinja2 <http://jinja.pocoo.org/2/>`_.
+<http://werkzeug.pocoo.org/>`_ and `Jinja2 <http://jinja.pocoo.org/>`_.
 Werkzeug is a toolkit for WSGI, the standard Python interface between web
 applications and a variety of servers for both development and deployment.
 Jinja2 renders templates.
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index a4494f43..05e27e74 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -347,7 +347,7 @@ Rendering Templates
 Generating HTML from within Python is not fun, and actually pretty
 cumbersome because you have to do the HTML escaping on your own to keep
 the application secure.  Because of that Flask configures the `Jinja2
-<http://jinja.pocoo.org/2/>`_ template engine for you automatically.
+<http://jinja.pocoo.org/>`_ template engine for you automatically.
 
 To render a template you can use the :func:`~flask.render_template`
 method.  All you have to do is provide the name of the template and the
@@ -380,7 +380,7 @@ package it's actually inside your package:
 
 For templates you can use the full power of Jinja2 templates.  Head over
 to the official `Jinja2 Template Documentation
-<http://jinja.pocoo.org/2/documentation/templates>`_ for more information.
+<http://jinja.pocoo.org/docs/templates>`_ for more information.
 
 Here is an example template:
 
diff --git a/docs/templating.rst b/docs/templating.rst
index 4e432333..bf672672 100644
--- a/docs/templating.rst
+++ b/docs/templating.rst
@@ -9,7 +9,7 @@ An extension can depend on Jinja2 being present.
 This section only gives a very quick introduction into how Jinja2
 is integrated into Flask.  If you want information on the template
 engine's syntax itself, head over to the official `Jinja2 Template
-Documentation <http://jinja.pocoo.org/2/documentation/templates>`_ for
+Documentation <http://jinja.pocoo.org/docs/templates>`_ for
 more information.
 
 Jinja Setup
diff --git a/docs/tutorial/templates.rst b/docs/tutorial/templates.rst
index 5ec5584d..fd3abe68 100644
--- a/docs/tutorial/templates.rst
+++ b/docs/tutorial/templates.rst
@@ -16,7 +16,7 @@ the layout of the website in all pages.
 
 Put the following templates into the `templates` folder:
 
-.. _Jinja2: http://jinja.pocoo.org/2/documentation/templates
+.. _Jinja2: http://jinja.pocoo.org/docs/templates
 
 layout.html
 -----------