diff --git a/LICENSE.md b/LICENSE.txt
similarity index 100%
rename from LICENSE.md
rename to LICENSE.txt
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..b88034e
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md
diff --git a/setup.py b/setup.py
index 97e75fe..80cb40f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,28 +1,13 @@
 from setuptools import setup
 
-with open('README.md') as f:
-    readme = f.read()
-
-with open('LICENSE.md') as f:
-    license = f.read()
-
-try:
-    from pypandoc import convert
-    readme = convert(readme, 'rst', format='md')
-    license = convert(license, 'rst', format='md')
-except ImportError:
-    print("Warning: pypandoc module not found, could not convert Markdown to RST")
-
 setup(
     name='pykitti',
-    version='0.1.0',
+    version='0.1.1',
     description='A minimal set of tools for working with the KITTI dataset in Python',
-    long_description=readme,
     author='Lee Clement',
     author_email='lee.clement@robotics.utias.utoronto.ca',
     url='https://github.com/utiasSTARS/pykitti',
-    download_url='https://github.com/utiasSTARS/pykitti/tarball/0.1.0',
-    license=license,
+    download_url='https://github.com/utiasSTARS/pykitti/tarball/0.1.1',
     packages=['pykitti'],
     install_requires=['numpy', 'matplotlib']
 )