diff --git a/docs/authors.rst b/docs/authors.rst
index e8e2819..4267251 100644
--- a/docs/authors.rst
+++ b/docs/authors.rst
@@ -12,3 +12,4 @@ By chronological order:
  * Julien Malik
  * Titoko
  * 0x010C
+ * QShulz
diff --git a/setup.py b/setup.py
index d622ba8..fb549ac 100644
--- a/setup.py
+++ b/setup.py
@@ -3,19 +3,15 @@
 
 from setuptools import setup
 
-try:
-    from pypandoc import convert
-    read_md = lambda f: convert(f, 'rst', format='md')
-except ImportError:
-    print("warning: pypandoc module not found, could not convert Markdown to RST")
-    read_md = lambda f: open(f, 'r').read()
-
+with open("README.md", "r") as fh:
+    long_description = fh.read()
 
 setup(name='prosopopee',
       version='0.8.2',
       description='A static website generator that allows you to tell a story with your pictures',
       author='Laurent Peuch',
-      long_description=read_md('README.md') + "\n\n\n" + open('docs/changelog.rst').read(),
+      long_description=long_description,
+      long_description_content_type="text/markdown",
       author_email='cortex@worlddomination.be',
       url='https://github.com/Psycojoker/prosopopee',
       install_requires=open("./requirements.txt", "r").read().split(),