diff --git a/MANIFEST.in b/MANIFEST.in
index 4c59f9ed98..c8891a699f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-include README.rst LICENSE HISTORY.rst
+include README.md LICENSE HISTORY.rst
 recursive-include mayan *.txt *.html *.css *.ico *.png *.jpg *.js *.po *.mo *.ttf *.woff *.woff2 LICENSE
 global-exclude mayan/settings/local.py mayan/settings/travis/* mayan/media/*
diff --git a/README.md b/README.md
index ebc381f84d..d75efe7909 100644
--- a/README.md
+++ b/README.md
@@ -63,20 +63,14 @@ Step 3- Open a browser and go to http://localhost
 
 <h2 align="center">Important links</h2>
 
-<a href="http://www.mayan-edms.com">Homepage</a>
 
-<a href="https://www.youtube.com/channel/UCJOOXHP1MJ9lVA7d8ZTlHPw">Videos</a>
+- [Homepage](http://www.mayan-edms.com)
+- [Videos](https://www.youtube.com/channel/UCJOOXHP1MJ9lVA7d8ZTlHPw)
+- [Documentation](http://mayan.readthedocs.io/en/stable/)
+- [Paid support](http://www.mayan-edms.com/providers/)
+- [Community forum](https://groups.google.com/forum/#!forum/mayan-edms)
+- [Community forum archive](http://mayan-edms.1003.x6.nabble.com/)
+- [Source code, issues, bugs](https://gitlab.com/mayan-edms/mayan-edms)
+- [Plug-ins, other related projects](https://gitlab.com/mayan-edms/)
+- [Translations](https://www.transifex.com/rosarior/mayan-edms/)
 
-<a href="http://mayan.readthedocs.io/en/stable/">Documentation</a>
-
-<a href="http://www.mayan-edms.com/providers/">Paid support</a>
-
-<a href="https://groups.google.com/forum/#!forum/mayan-edms">Community forum</a>
-
-<a href="http://mayan-edms.1003.x6.nabble.com/">Community forum archive</a>
-
-<a href="https://gitlab.com/mayan-edms/mayan-edms">Source code, issues, bugs</a>
-
-<a href="https://gitlab.com/mayan-edms/">Plug-ins, other related projects</a>
-
-<a href="https://www.transifex.com/rosarior/mayan-edms/">Translations</a>
diff --git a/requirements/development.txt b/requirements/development.txt
index 46a154d3c8..8fd957cd99 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -8,6 +8,8 @@ django-rosetta==0.7.8
 
 ipython==4.0.3
 
+pypandoc==1.3.3
+
 transifex-client==0.12.2
 
 wheel==0.26.0
diff --git a/setup.py b/setup.py
index 29aff914e9..76bdb6880c 100644
--- a/setup.py
+++ b/setup.py
@@ -91,8 +91,13 @@ pytz==2015.4
 sh==1.11
 """.split()
 
-with open('README.rst') as f:
-    readme = f.read()
+try:
+    import pypandoc
+    readme = pypandoc.convert_file('README.md', 'rst')
+except (IOError, ImportError):
+    with open('README.md') as f:
+        readme = f.read()
+
 with open('HISTORY.rst') as f:
     history = f.read()