diff --git a/CHANGES.rst b/CHANGES.rst
index 889fd9a..3305c0b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -351,7 +351,7 @@ Released 2015-07-26, codename Replacement
 -   Fixed loop length calculation for some iterators.
 -   Changed how Jinja enforces strings to be native strings in Python 2
     to work when people break their default encoding.
--   Added :func:`make_logging_undefined` which returns an undefined
+-   Added ``make_logging_undefined`` which returns an undefined
     object that logs failures into a logger.
 -   If unmarshalling of cached data fails the template will be reloaded
     now.
@@ -367,8 +367,7 @@ Released 2015-07-26, codename Replacement
 -   Add ability to use custom subclasses of
     ``jinja2.compiler.CodeGenerator`` and ``jinja2.runtime.Context`` by
     adding two new attributes to the environment
-    (``code_generator_class`` and ``context_class``) (pull request
-    ``:issue:`404```).
+    (``code_generator_class`` and ``context_class``). :pr:`404`
 -   Added support for context/environment/evalctx decorator functions on
     the finalize callback of the environment.
 -   Escape query strings for urlencode properly. Previously slashes were
@@ -559,7 +558,6 @@ Released 2010-05-29, codename Incoherence
 -   Fixed a bug for getattribute constant folding.
 -   Support for newstyle gettext translations which result in a nicer
     in-template user interface and more consistent catalogs.
-    (:ref:`newstyle-gettext`)
 -   It's now possible to register extensions after an environment was
     created.
 
@@ -581,13 +579,13 @@ Released 2010-04-13, codename Correlation
     through a template object if it was passed to it. This makes it
     possible to import or extend from a template object that was passed
     to the template.
--   Added a :class:`ModuleLoader` that can load templates from
+-   Added a ``ModuleLoader`` that can load templates from
     precompiled sources. The environment now features a method to
     compile the templates from a configured loader into a zip file or
     folder.
 -   The _speedups C extension now supports Python 3.
 -   Added support for autoescaping toggling sections and support for
-    evaluation contexts (:ref:`eval-context`).
+    evaluation contexts.
 -   Extensions have a priority now.
 
 
@@ -689,7 +687,7 @@ Released 2008-11-23, codename Yasuzō
 -   Added ``sort`` filter that works like ``dictsort`` but for arbitrary
     sequences.
 -   Fixed a bug with empty statements in macros.
--   Implemented a bytecode cache system. (:ref:`bytecode-cache`)
+-   Implemented a bytecode cache system.
 -   The template context is now weakref-able
 -   Inclusions and imports "with context" forward all variables now, not
     only the initial context.
@@ -709,13 +707,11 @@ Released 2008-07-17, codename Jinjavitus
     from slightly. It's now possible to give attributes or items a
     higher priority by either using dot-notation lookup or the bracket
     syntax. This also changed the AST slightly. ``Subscript`` is gone
-    and was replaced with :class:`~jinja2.nodes.Getitem` and
-    :class:`~jinja2.nodes.Getattr`. For more information see :ref:`the
-    implementation details <notes-on-subscriptions>`.
+    and was replaced with ``Getitem`` and ``Getattr``.
 -   Added support for preprocessing and token stream filtering for
     extensions. This would allow extensions to allow simplified gettext
     calls in template data and something similar.
--   Added :meth:`jinja2.environment.TemplateStream.dump`.
+-   Added ``TemplateStream.dump``.
 -   Added missing support for implicit string literal concatenation.
     ``{{ "foo" "bar" }}`` is equivalent to ``{{ "foobar" }}``
 -   ``else`` is optional for conditional expressions. If not given it
diff --git a/setup.py b/setup.py
index 70915ff..7d94cd3 100644
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,7 @@ setup(
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",