diff --git a/.gitignore b/.gitignore
index 0aa04c2..9207dc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ dist
 # IDE Files
 atlassian-ide-plugin.xml
 .idea/
+.vscode/
 *.swp
 *.kate-swp
 .ropeproject/
diff --git a/setup.cfg b/setup.cfg
index 7cbab2d..073d2b1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,3 +4,6 @@ universal = 1
 [flake8]
 ignore = F401,F403,E502,E123,E127,E128,E303,E713,E111,E241,E302,E121,E261,W391
 max-line-length = 120
+
+[metadata]
+license_file = LICENSE
diff --git a/setup.py b/setup.py
index a8ea364..aabfe3d 100755
--- a/setup.py
+++ b/setup.py
@@ -75,16 +75,17 @@ def run_tests(self):
 
 cmdclass['test'] = PyTest
 
-try:
-   import pypandoc
-   readme = pypandoc.convert('README.md', 'rst')
-except (IOError, ImportError, OSError, RuntimeError):
-   readme = ''
+
+with open('README.md', encoding='utf-8') as f:  # Loads in the README for PyPI
+    long_description = f.read()
+
 
 setup(name='hug_authentication_ldap',
       version='1.0.3',
       description='LDAP based authentication support for hug',
-      long_description=readme,
+      long_description=long_description,
+      # PEP 566, the new PyPI, and setuptools>=38.6.0 make markdown possible
+      long_description_content_type='text/markdown',
       author='Timothy Crosley',
       author_email='timothy.crosley@gmail.com',
       url='https://github.com/timothycrosley/hug_authentication_ldap',