diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1c0fe3860..6f3cc8567 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,9 @@
 Changelog
 #########
 
+* 1.2.0
+  * New Docker image, now based on Alpine, thanks to the efforts of `addadi`_
+  and `Pit`_.
 * 1.1.0
   * Fix for `#283`_, a redirect bug which broke interactions with
     paperless-desktop.  Thanks to `chris-aeviator`_ for reporting it.
@@ -268,6 +271,7 @@ Changelog
 .. _Lukas Winkler: https://github.com/Findus23
 .. _chris-aeviator: https://github.com/chris-aeviator
 .. _Dan Panzarella: https://github.com/pzl
+.. _addadi: https://github.com/addadi
 
 .. _#20: https://github.com/danielquinn/paperless/issues/20
 .. _#44: https://github.com/danielquinn/paperless/issues/44
@@ -317,3 +321,5 @@ Changelog
 .. _#283: https://github.com/danielquinn/paperless/issues/283
 .. _#256: https://github.com/danielquinn/paperless/pull/256
 .. _#285: https://github.com/danielquinn/paperless/pull/285
+
+.. _pipenv: https://docs.pipenv.org/
diff --git a/docs/setup.rst b/docs/setup.rst
index 7fad393ba..f8c696fc8 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -175,7 +175,8 @@ Docker Method
    modified versions of the configuration files.
 4. Modify ``docker-compose.yml`` to your preferences, following the
    instructions in comments in the file. The only change that is a hard
-   requirement is to specify where the consumption directory should mount. _. [#docker-compose.yml]_
+   requirement is to specify where the consumption directory should
+   mount.[#dockercomposeyml]_
 5. Modify ``docker-compose.env`` and adapt the following environment variables:
 
    ``PAPERLESS_PASSPHRASE``
@@ -288,10 +289,11 @@ Docker Method
    simplifies deployment immensely. If you know your way around Docker, feel
    free to tinker around without using compose!
 
-.. [#docker-compose.yml] If you're upgrading your docker-compse images from version
-   1.1.0 or earlier, you might need to change in the ``docker-compose.yml`` 
-   file the ``image: pitkley/paperless`` directive in both the ``webserver`` and ``consumer``
-   sections to ``build: ./`` as per the newer ``docker-compose.yml.example`` file
+.. [#dockercomposeyml] If you're upgrading your docker-compose images from
+   version 1.1.0 or earlier, you might need to change in the
+   ``docker-compose.yml`` file the ``image: pitkley/paperless`` directive in
+   both the ``webserver`` and ``consumer`` sections to ``build: ./`` as per the
+   newer ``docker-compose.yml.example`` file
 
 .. _setup-permanent: