diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,20 +1,22 @@
 name       : mako
-version    : 1.0.7
-release    : 3
+version    : 1.0.10
+release    : 4
 source     :
-    - https://files.pythonhosted.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/Mako-1.0.7.tar.gz : 4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae
+    - https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.0.10.tar.gz : 7165919e78e1feb68b4dbe829871ea9941398178fa58e6beedb9ba14acf63965
 license    : MIT
 component  : programming.python
 summary    : Python templating language
 description: |
     A super-fast templating language that borrows the best ideas from the existing templating languages.
 builddeps  :
-    - pkgconfig(python-2.7)
-    - pkgconfig(python3)
-    - python-setuptools
+    - python-markupsafe
+    - python-mock
+    - python-pytest
+rundeps    :
+    - python-markupsafe
 build      : |
-    python setup.py build
-    python3 setup.py build
+    %python3_setup
 install    : |
-    python setup.py install --root=%installroot% --no-compile -O0
-    python3 setup.py install --root=%installroot% --no-compile -O0
+    %python3_install
+check      : |
+    %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,15 +2,15 @@
     <Source>
         <Name>mako</Name>
         <Packager>
-            <Name>Bryan T. Meyers</Name>
-            <Email>bmeyers@datadrake.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Packager>
         <License>MIT</License>
         <PartOf>programming.python</PartOf>
         <Summary xml:lang="en">Python templating language</Summary>
         <Description xml:lang="en">A super-fast templating language that borrows the best ideas from the existing templating languages.
 </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>mako</Name>
@@ -20,47 +20,31 @@
         <PartOf>programming.python</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin/mako-render</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mako-1.0.7-py2.7.egg-info/PKG-INFO</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mako-1.0.7-py2.7.egg-info/SOURCES.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mako-1.0.7-py2.7.egg-info/dependency_links.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mako-1.0.7-py2.7.egg-info/entry_points.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mako-1.0.7-py2.7.egg-info/not-zip-safe</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mako-1.0.7-py2.7.egg-info/requires.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mako-1.0.7-py2.7.egg-info/top_level.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/_ast_util.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ast.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/cache.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/cmd.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/codegen.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/compat.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/exceptions.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ext/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ext/autohandler.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ext/babelplugin.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ext/beaker_cache.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ext/extract.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ext/linguaplugin.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ext/preprocessors.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ext/pygmentplugin.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/ext/turbogears.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/filters.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/lexer.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/lookup.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/parsetree.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/pygen.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/pyparser.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/runtime.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/template.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mako/util.py</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.7-py3.6.egg-info/PKG-INFO</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.7-py3.6.egg-info/SOURCES.txt</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.7-py3.6.egg-info/dependency_links.txt</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.7-py3.6.egg-info/entry_points.txt</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.7-py3.6.egg-info/not-zip-safe</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.7-py3.6.egg-info/requires.txt</Path>
-            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.7-py3.6.egg-info/top_level.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.10-py3.6.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.10-py3.6.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.10-py3.6.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.10-py3.6.egg-info/entry_points.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.10-py3.6.egg-info/not-zip-safe</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.10-py3.6.egg-info/requires.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/Mako-1.0.10-py3.6.egg-info/top_level.txt</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/__init__.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/_ast_util.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/ast.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/cache.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/cmd.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/codegen.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/compat.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/exceptions.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/filters.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/lexer.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/lookup.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/parsetree.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/pygen.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/pyparser.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/runtime.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/template.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/__pycache__/util.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/_ast_util.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ast.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/cache.py</Path>
@@ -69,6 +53,15 @@
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/compat.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/exceptions.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__pycache__/__init__.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__pycache__/autohandler.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__pycache__/babelplugin.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__pycache__/beaker_cache.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__pycache__/extract.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__pycache__/linguaplugin.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__pycache__/preprocessors.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__pycache__/pygmentplugin.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/__pycache__/turbogears.cpython-36.pyc</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/autohandler.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/babelplugin.py</Path>
             <Path fileType="library">/usr/lib/python3.6/site-packages/mako/ext/beaker_cache.py</Path>
@@ -89,12 +82,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="3">
-            <Date>2018-08-27</Date>
-            <Version>1.0.7</Version>
+        <Update release="4">
+            <Date>2019-05-13</Date>
+            <Version>1.0.10</Version>
             <Comment>Packaging update</Comment>
-            <Name>Bryan T. Meyers</Name>
-            <Email>bmeyers@datadrake.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file