diff --git a/docs/conf.py b/docs/conf.py
index 60c85fac98..8cfa451fba 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,9 @@ from typing import Any, Dict, List, Optional
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = []  # type: List[str]
+extensions = [
+    'recommonmark',
+]  # type: List[str]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -292,17 +294,16 @@ texinfo_documents = [
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
 
-from recommonmark.parser import CommonMarkParser
 from recommonmark.transform import AutoStructify
 
-source_parsers = {
-    '.md': CommonMarkParser,
+# The suffix(es) of source filenames. You can specify multiple suffix
+# as a dictionary mapping file extensions to file types
+# https://www.sphinx-doc.org/en/master/usage/markdown.html:
+source_suffix = {
+    '.rst': 'restructuredtext',
+    '.md': 'markdown',
 }
 
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-source_suffix = ['.rst', '.md']
-
 # Temporary workaround to supress warnings after upgrading to recommonmark==0.5.0
 # Otherwise, sphinx build complains about all the links ending in .html
 # See PR # for more details
diff --git a/docs/development/remote.md b/docs/development/remote.md
index be12d574a6..afadeb3316 100644
--- a/docs/development/remote.md
+++ b/docs/development/remote.md
@@ -81,8 +81,7 @@ This will start up the Zulip server on port 9991. You can then
 navigate to `http://<REMOTE_IP>:9991` and you should see something like
 this screenshot of the Zulip development environment:
 
-![Image of Zulip development
-environment](../images/zulip-dev.png)
+![Image of Zulip development environment](../images/zulip-dev.png)
 
 The `--interface=''` option makes the Zulip development environment
 accessible from any IP address (in contrast with the much more secure
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 670290f072..28fbdd7dd1 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -143,7 +143,7 @@ pytz==2019.2
 pyyaml==5.1.2             # via cfn-lint, moto, yamole
 qrcode==6.1               # via django-two-factor-auth
 queuelib==1.5.0           # via scrapy
-recommonmark==0.5.0
+recommonmark==0.6.0
 redis==3.3.8
 regex==2019.8.19
 requests-oauthlib==1.2.0  # via python-twitter, social-auth-core
diff --git a/requirements/docs.in b/requirements/docs.in
index 2af05e8790..13a5dc633d 100644
--- a/requirements/docs.in
+++ b/requirements/docs.in
@@ -12,4 +12,4 @@ sphinx
 sphinx-rtd-theme
 
 # Needed to build markdown docs
-recommonmark==0.5.*  # https://github.com/zulip/zulip/issues/11395
+recommonmark
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 2c9c99ac3f..7bcef7995e 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -22,7 +22,7 @@ packaging==19.2           # via sphinx
 pygments==2.4.2           # via sphinx
 pyparsing==2.4.2          # via packaging
 pytz==2019.2              # via babel
-recommonmark==0.5.0
+recommonmark==0.6.0
 requests==2.22.0          # via sphinx
 six==1.12.0               # via packaging
 snowballstemmer==1.9.1    # via sphinx
diff --git a/version.py b/version.py
index b193d30e1c..98b70955fe 100644
--- a/version.py
+++ b/version.py
@@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea
 #   historical commits sharing the same major version, in which case a
 #   minor version bump suffices.
 
-PROVISION_VERSION = '56.2'
+PROVISION_VERSION = '57.0'