diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,46 +1,35 @@
 name       : certbot
-version    : 0.19.0
-release    : 2
+version    : 0.21.0
+release    : 3
 source     :
-    - https://github.com/certbot/certbot/archive/v0.19.0.tar.gz : 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723
+    - https://files.pythonhosted.org/packages/source/c/certbot/certbot-0.21.0.tar.gz : 07ca3246d3462fe73418113cc5c1036545f4b2312831024da923054de3a85857
 license    : Apache-2.0
 component  : security.crypto
-summary    : A tool to automatically receive and install X.509 certificates to enable TLS on servers. The client will interoperate with the Let’s Encrypt CA which will be issuing browser-trusted certificates for free.
+summary    : A tool to automatically receive and install X.509 certificates to enable TLS on servers. The client will interoperate with the Let’s Encrypt CA which will be issuing browser-trusted certificates
+    for free.
 description: |
     Certbot, previously the Let's Encrypt Client, is EFF's tool to obtain certs from Let's Encrypt, and (optionally) auto-enable HTTPS on your server. It can also act as a client for any other CA that uses the ACME protocol.
 builddeps  :
     - python-acme
     - python-configargparse
-    - python-cryptography
     - python-ipaddress
-    - python-mock
     - python-ndg-httpsclient
-    - python-openssl
     - python-parsedatetime
-    - python-pyrfc3339
-    - python-pytz
-    - python-setuptools
     - python-zope.component
 rundeps    :
     - python-acme
     - python-configargparse
     - python-configobj
-    - python-cryptography
     - python-ipaddress
-    - python-openssl
-    - python-mock
     - python-ndg-httpsclient
     - python-parsedatetime
     - python-psutil
-    - python-pyrfc3339
-    - python-pytz
-    - python-requests
-    - python-setuptools
-    - python-six
-    - python-zope.interface
+    - python-zope.component
 build      : |
     %python_setup
 install    : |
     %python_install
 check      : |
-    %python_setup test
+    pushd $PKG_BUILD_DIR/py2build
+        python setup.py test
+    popd
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>certbot</Name>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Packager>
         <License>Apache-2.0</License>
         <PartOf>security.crypto</PartOf>
@@ -20,12 +20,12 @@
         <PartOf>security.crypto</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.19.0-py2.7.egg-info/PKG-INFO</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.19.0-py2.7.egg-info/SOURCES.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.19.0-py2.7.egg-info/dependency_links.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.19.0-py2.7.egg-info/entry_points.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.19.0-py2.7.egg-info/requires.txt</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.19.0-py2.7.egg-info/top_level.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.21.0-py2.7.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.21.0-py2.7.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.21.0-py2.7.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.21.0-py2.7.egg-info/entry_points.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.21.0-py2.7.egg-info/requires.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/certbot-0.21.0-py2.7.egg-info/top_level.txt</Path>
             <Path fileType="library">/usr/lib/python2.7/site-packages/certbot/__init__.py</Path>
             <Path fileType="library">/usr/lib/python2.7/site-packages/certbot/__init__.pyc</Path>
             <Path fileType="library">/usr/lib/python2.7/site-packages/certbot/account.py</Path>
@@ -223,12 +223,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="2">
-            <Date>2017-11-29</Date>
-            <Version>0.19.0</Version>
+        <Update release="3">
+            <Date>2018-01-18</Date>
+            <Version>0.21.0</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