diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : python-markdown
-version    : 3.0.1
-release    : 4
+version    : 3.1.1
+release    : 5
 source     :
-    - https://github.com/Python-Markdown/markdown/archive/3.0.1.tar.gz : e45cda91bfd07195f17ca565226010238b8c90ccfa82a79b15f4379510576335
+    - https://github.com/Python-Markdown/markdown/archive/3.1.1.tar.gz : 6a6733d333f9115c2653e0ebd486eae368861c2834dd8e809d2781f6cb0fedea
 license    : BSD-3-Clause
 component  : programming.python
 summary    : A Python implementation of Markdown
@@ -11,21 +11,9 @@
     It is almost completely compliant with the reference implementation, though there are a few known issues.
 builddeps  :
     - pkgconfig(python3)
-    - python-setuptools
 build      : |
-    %python_setup
     %python3_setup
 install    : |
     %python3_install
-    for _f in "$installdir"/usr/bin/*; do
-        mv -v "${_f}" "${_f}3"
-    done
-    %python_install
 check      : |
-    pushd $PKG_BUILD_DIR/py2build
-        python setup.py test
-    popd
-
-    pushd $PKG_BUILD_DIR/py3build
-        python3 setup.py test
-    popd
+    %python3_test
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>python-markdown</Name>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Packager>
         <License>BSD-3-Clause</License>
         <PartOf>programming.python</PartOf>
@@ -11,7 +11,7 @@
         <Description xml:lang="en">This is a Python implementation of Markdown.
 It is almost completely compliant with the reference implementation, though there are a few known issues.
 </Description>
-        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>python-markdown</Name>
@@ -22,85 +22,23 @@
         <PartOf>programming.python</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin/markdown_py</Path>
-            <Path fileType="executable">/usr/bin/markdown_py3</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Markdown-3.0.1-py2.7.egg-info/PKG-INFO</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Markdown-3.0.1-py2.7.egg-info/SOURCES.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Markdown-3.0.1-py2.7.egg-info/dependency_links.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Markdown-3.0.1-py2.7.egg-info/entry_points.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Markdown-3.0.1-py2.7.egg-info/top_level.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/__init__.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/__main__.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/__main__.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/blockparser.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/blockparser.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/blockprocessors.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/blockprocessors.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/core.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/core.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/__init__.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/abbr.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/abbr.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/admonition.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/admonition.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/attr_list.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/attr_list.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/codehilite.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/codehilite.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/def_list.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/def_list.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/extra.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/extra.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/fenced_code.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/fenced_code.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/footnotes.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/footnotes.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/legacy_attrs.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/legacy_attrs.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/legacy_em.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/legacy_em.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/meta.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/meta.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/nl2br.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/nl2br.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/sane_lists.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/sane_lists.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/smarty.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/smarty.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/tables.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/tables.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/toc.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/toc.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/wikilinks.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/extensions/wikilinks.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/inlinepatterns.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/inlinepatterns.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/postprocessors.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/postprocessors.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/preprocessors.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/preprocessors.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/serializers.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/serializers.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/test_tools.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/test_tools.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/treeprocessors.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/treeprocessors.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/util.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/markdown/util.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.0.1-py3.6.egg-info/PKG-INFO</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.0.1-py3.6.egg-info/SOURCES.txt</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.0.1-py3.6.egg-info/dependency_links.txt</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.0.1-py3.6.egg-info/entry_points.txt</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.0.1-py3.6.egg-info/top_level.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.1.1-py3.6.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.1.1-py3.6.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.1.1-py3.6.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.1.1-py3.6.egg-info/entry_points.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.1.1-py3.6.egg-info/requires.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Markdown-3.1.1-py3.6.egg-info/top_level.txt</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__main__.py</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__meta__.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/__init__.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/__main__.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/__meta__.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/blockparser.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/blockprocessors.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/core.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/inlinepatterns.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/pep562.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/postprocessors.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/preprocessors.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/__pycache__/serializers.cpython-36.pyc</Path>
@@ -147,6 +85,7 @@
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/extensions/toc.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/extensions/wikilinks.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/inlinepatterns.py</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/pep562.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/postprocessors.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/preprocessors.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/markdown/serializers.py</Path>
@@ -156,12 +95,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="4">
-            <Date>2018-10-28</Date>
-            <Version>3.0.1</Version>
+        <Update release="5">
+            <Date>2019-10-12</Date>
+            <Version>3.1.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file