diff --git a/cli4.man b/cli4.man
deleted file mode 100644
index de18d1c..0000000
--- a/cli4.man
+++ /dev/null
@@ -1,97 +0,0 @@
-.TH CLI4 1
-
-.SH NAME
-cli4 \- Command line access to CloudFlare v4 API
-
-.SH SYNOPSIS
-.B cli4
-[\fB\-V\fR]
-[\fB\-h\fR|\fB\-\-help]
-[\fB\-v\fR|\fB\-\-verbose]
-[\fB\-q\fR|\fB\-\-quiet]
-[\fB\-j\fR|\fB\-\-json]
-[\fB\-y\fR|\fB\-\-yaml]
-[\fB\-n\fR|\fB\-\-ndjson]
-[\fBitem\fR=\fIvalue\fR ...]
-[\fB\-G\fR|\fB\-\-get]
-[\fB\-P\fR|\fB\-\-patch]
-[\fB\-O\fR|\fB\-\-post]
-[\fB\-U\fR|\fB\-\-put]
-[\fB\-D\fR|\fB\-\-delete]
-.IR /command ...
-
-.SH DESCRIPTION
-.B cli4
-provides command line access to CloudFlare v4 API
-
-.SH OPTIONS
-.TP
-.IP "[\-V, \-\-version]"
-Display program version number and exit.
-.IP "[\-h, \-\-help]"
-This information (in a terse form).
-.IP "[\-v, \-\-verbose]"
-Provide some protcol debugging information.
-.IP "[\-q, \-\-quiet]"
-Don't output any JSON/YAML responses.
-.IP "[\-j, \-\-json]"
-Output response data in JSON format (the default).
-.IP "[\-y, \-\-yaml]"
-Output response data in YAML format (if yaml package installed).
-.IP "[\-n, \-\-ndjson]"
-Output response data in NDJSON format (if jsonlines package installed).
-.IP "\-\-get"
-Send HTTP request as a \fBGET\fR (the default).
-.IP "\-\-patch"
-Send HTTP request as a \fBPATCH\fR.
-.IP "\-\-post"
-Send HTTP request as a \fBPOST\fR.
-.IP "\-\-put"
-Send HTTP request as a \fBPUT\fR.
-.IP "\-\-delete"
-Send HTTP request as a \fBDELETE\fR.
-.IP "item=\fIvalue\fR"
-Set a paramater or data value to send with a \fBGET\fR, \fBPATCH\fR, \fBPOST\fR, \fBPUT\fR or \fBDELETE\fR command. The value is sent as a string.
-.IP item:=\fIvalue\fR
-Set a paramater or data value to send with a \fBGET\fR, \fBPATCH\fR, \fBPOST\fR, \fBPUT\fR or \fBDELETE\fR command. The value is sent as an interger.
-.IP /command...
-The API command.
-The command uses slash (\fB/\fR) to seperate the verbs in the same way that the CloudFlare v4 API documentation does.
-Any verb starting with colon (\fB:\fR) is either converted to zone_id, user_id, organtization_id, or otherwise.
-
-.SH RESULTS
-The output is either JSON or YAML formatted.
-
-.SH EXAMPLES
-.B cli4 /zones
-List infomation for all zones.
-
-.B cli4 /zones/:example.com
-List specific zone info.
-
-.B cli4 /zones/:example.com/settings
-List settings for a specific zone.
-
-.B cli4 --delete purge_everything=true /zones/:example.com/purge_cache
-Purge cache for a specific zone.
-
-.B cli4 --delete files='[http://example.com/css/styles.css]' /zones/:example.com/purge_cache
-Purge cache for a specific zone.
-
-.B cli4 --delete files='[http://example.com/css/styles.css,http://example.com/js/script.js] /zones/:example.com/purge_cache
-Purge cache for a specific zone.
-
-.B cli4 --delete tags='[tag1,tag2,tag3]' /zones/:example.com/purge_cache
-Purge cache for a specific zone.
-
-.B cli4 /zones/:example.com/available_plans
-List available plans for a zone.
-
-.B cli4 --patch status=active /zones/:example.com/dnssec
-Make DNSSEC active for specfic zone.
-
-.B cli4 /zones/:example.com/dnssec
-List DNSSEC infomation and status for a specific zone.
-
-.SH SEE ALSO
-The CloudFlare API can be found https://api.cloudflare.com/. Each API call is provided via a similarly named function within the CloudFlare class.
diff --git a/gpg-7ea139c40c1c842f9d41aaf94a34925d05172859.asc b/gpg-7ea139c40c1c842f9d41aaf94a34925d05172859.asc
deleted file mode 100644
index a7a533d..0000000
--- a/gpg-7ea139c40c1c842f9d41aaf94a34925d05172859.asc
+++ /dev/null
@@ -1,136 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFTZ9yQBEADhwi3eeuVd0IRgYDf6QMB4M4+B6hDd+2gBTeSZwA1buV2/TCxF
-LgaYut3UQ8O7jkRigG8z7ILuMdDiWVWA+FNGViXpCuLIHDlJo7hHQWlJsAAd2zqJ
-Ft9FeYA7Gd3LNvdFMKLbQFZ3i03if5YrBgBF05XWn2Iz3ioWXVr9aEy2O3FSBVOY
-CW4VI5c94y0OSlFFVVzK1/412+3UkuxJ3kR6g+blk1e+ehqJuetccofJ9zSKxB9L
-zzYCW6jQJw7hD1Iq2uniewvEi6FXccGu17J/FmYtWsIFFvwzWby/Dwd5KaVcQUQu
-wvZXd4b5rW9pSrt2Mty9LdbL9ocw82CCMA5P6INryT5nhP+K5Ra2w9SBvAA6KCaR
-2BesheeStvAnDI3sBJoPNl0v86+efeD5iU2+tSGOy0JKcLP5pZjILpwleOmrR5u+
-IgIqB+Ety2t0TFoGwkApIZWRd0lRVbEzMeLNWDNf8FnH0wecQpQXQ5Rk3VXbEl6i
-nH/ZqP2rfx52zz7LxP+1IZVfI38WHjfmlOlIpxnm6JONMDQ+I6zn7EJZf2bChwcr
-XYoDy25DBl79wKtTa8BLAG8YWWjR0ey5Gt0Qy/Qnnqb2rruwZgvZ+Y4eZAR4pKW3
-CpnJi53a4Rv2Iz6fsm87NocRXZn1S5K+qWNyvwa1Q6TXMUIwiqf0OL4S1QARAQAB
-tEVNYXJ0aW4gSi4gTGV2eSAoTWFydGluIExldnkgLSBob21lIGVtYWlsIGFkZHJl
-c3MpIDxtYWh0aW5AbWFodGluLmNvbT6JAlQEEwEKAD4CGwMFCwkIBwMFFQoJCAsF
-FgIDAQACHgECF4AWIQR+oTnEDByEL51BqvlKNJJdBRcoWQUCXE5bmAUJDwz49AAK
-CRBKNJJdBRcoWQbXEACwSt2B825wsOt7F9/fYgcx7v6v05I4V29zBv4EdCjvAJdY
-xeC6FPzEQo/EpcPeABI0GmSh1u97a0xm0h9OR10OjTc7TcKsvvQj9YvhCv/90tl5
-tlc2HCCJHAn2Hdx8E9Qvh/mLPigVyyHDnuojYyrLVvGkV0nIEevG2HPfv6JOTVRq
-wfedoMcu60yr6QkZXz524u+rwnH2mXxOM0B5pcXcnVlTnFe3tiTUgeskLeC2CZw9
-BX7b6qraD2RF3+1zNvi7gkj6q9YYlZpe/tZs0M7Yr0y3z8V+3lzt80oxXLDGp/rz
-/xPdGKO+yCRiQuVOEg5BVbD8INXWkiTRn94Wmo7X+iP8Fh8hqBlRqtBJ0iTXHYD8
-AU1dMdmQYge86+hZ84hUGMoKvr7yZi1sdUnpEErJyzmRllLSBWF1Tg9Uz91C3mSG
-PGgSlyyw3V8CyA4VTVAdhGE1iTKuXx7cKQds7bcFSvBh1gdf+5l5YUy+88RoHtCR
-V6sfi+PGzqIHh+wcstNwtU0sA6NUvIvIm9HY9kr1OiLZEPa14HTJ45r3ebwjllCy
-z/GNCdBdI/ywkEZORgXdIWZfB6FPbzSeJKpt5v9KAkirRCUy7biggEa/Rx6P5q1/
-YsGdAbjjkwLzQbrUAfAs6omwe1PQhOmVOZbOyoZBcrRsQs8bqDYvzK2I5wPLyYkB
-IgQQAQoADAUCVR1FYQWDB4YfgAAKCRCUT2+4ykuT2cxvCACHbDKHWTZnXDnajEVP
-UgzsGUOafAOlsyL0KeQaEdvwokwHwCIH7gBpALRF4k4LHKkqd19YZN0qZGEX7C0k
-zeFrYl0zhIUtEAbmTFK2bptmvM6F+EC/mr78+7s5588dYUXpaPPAtFagM4v1qGho
-oJLGMs6X6AiPjB6t/KFTxxnIrSR8u9sMTHbxfGdqKTPjvDNtN+a4D4Wi+0jnnyGP
-+1unwSMva/TY9r1dgawuvF+cWdCXUWu0aWVJ8l1yZPItMhjDNllpVWhz87Ez5X24
-+qj/9hPiITC90qkire5yoKTpZMjShDq32Lzbn9y9WS9cMBUBCJyQzUC73pEDheAr
-a4fOiQIiBBMBCgAMBQJVHUGiBYMHhh+AAAoJEGu5/mUrlTUADhYQAMFRCeMyU7aG
-ctSkvRdcV2X3AQJUJppFi5ghOw85yr/Kwxlhekv5jp36s1hU0ua8lPaQ8eDZGjfo
-s0XeCkNqR2ZoenakomlTLAMp9KLqpddLjW2YerIWkslGavHRTf2Gzhb9sHO62tem
-n+pMI69XI3ECFc+QPiP8L0Sfw5CoYwTSXCqYyTRLYg+ls4plbU82c+L1zXxUnHWX
-aqmAtZVHdQnhU5/KfUZXMZk/Wjfbbn9dw3fJ6IOUeMhO7GHGHY4A7S/5zakALe2I
-knRqZ3OxBxtbiDs8PPiM8fH9FkTVKsRsK50rQ2CwMST35O4h+8hAVBWATJsmSFu0
-jRu0vVHZB8vbgv3EMiLEqv5jvztcWDb8bRzxbSzTRztyfoVAIMcrJIdWJx/Ofkwv
-54YYiffo66KyvuO+zSX/p+NzicbO2/2I74Dr7kT7u1j1JVrckHZxmPupVHwo9DxG
-6NCglzaBhEpCQ8RI0UjSS3P0MoZa4q1ctnSte5Q6yxKbzDpeDquqq1NS24bKokHq
-SzUjwV6qfWc+MwbUP85gmJV4ITNsioOm9WpHw0yLjPOXzRCZlYbZDld/Hf3qVD9g
-TI7t/xVGlA7ZnHTnEG9A5CVuZg7kEQ3vaVKfXioizRHh49L3RX7YNybqlALQrckh
-q9SLgaAUvs991LsVXXRpJaaLeaDfdrZciQEcBBABCAAGBQJVHUTHAAoJENDGHbBR
-n/isC28H/3IN5TlWS8gIn5dFSvjuMkjO3JgyeR4tb5yfldX2d3x/nvl2biDjTzBN
-kIpRffNexIwKlBw8GB9hvNV9OZgREBFCEUwvgtb1udARtdph6QE7vMTSp7zVEEKO
-SvhgbVA5DekWwx/SchjXTCaulNHmuF5G/ZYEoMWBSicrjXeLm8p+rVX9Bmr9OHat
-4sGvArelHntwBnNon67Wa23+MZdiRRQnt1mXStKIVh/boaf9nmaVvWBBctngZUbi
-dYeWPK+c3BodWtWR4PiI0pWo+GZgTZGxbyarf8qNV7otulCYeQsmZR4mAcWP+UH+
-kCU5CgNU9W77xuahWZdsAJd7yADuMXmJAhwEEAEIAAYFAlUdTCsACgkQl9tFofzR
-VF/ZCRAA1Bzybfm6aWR3icjp5KkT/G7PORwhSrcqNPp+32C3u4SqRK+5xZGC2bey
-6hoYH76nr+GLGU2Pv4hSFSA6MOwfZX7lDiurfSKpKKCFDSWI9wJ69ZoFen73WEWT
-K64sES2IDiQ6k6IzUWGnFTevhcwi/Afu+xFAjcX1C0dr/ISvvnnSlmzCtSqvLs3k
-AdvOpx5z8ZGWco6VgeRsekVymfmMARKiMQH9q2BalJ+w4++ISCvxgtHfTtmeka7y
-ES/8+Ns2DC7g4UGmPLozN6rDDtDICp5TfIVipRrlj+dNH3Fb7OaIjA9F/x4KorUy
-KqEaJSsB0baBDYTa+X6u3KX5u8xox1XS7/FFDweJC3gyudA/LY22y94Ll/PMw39B
-FgSAE/TV1rWXnaRNVJkinPuji9cvxibZ+u6EUILz2OlQtQfJs+70JyeQC6muTcgz
-436O/qQuhIm9GqVYNwJQKU24FdQIwCtY7BofqgCYraTxO/aAT90oqLJS7/V0AXtx
-uU1UFA8JFkoAs2f8PkyaeOsJTkcKtvT/UKSsxzkLUzkMQhWA7DTNRlhb3PQZeyXE
-9cq/+Qf1gRzO2i3l6JLLhG6E5uAVJLQMyYWrED45V+YZelCZxk8GMhO6QOS2U/4i
-Ug4uK7IvpW3cMtpEyVHfIgOJ7uprrx65mWqz7REGltECUuXDXYGIRgQQEQIABgUC
-VTJJCQAKCRCJkf9izLy+muuLAKC/f3pdl3AXIya+UXS9jnYgk0jbBACfQBqRgdjN
-b6DFNq2q5r0iFd1dA/qJAhwEEgECAAYFAlVTgU4ACgkQ+Gx+gIL3cMCSfw//VX2d
-I7O6elR6ORix9egC0CF/DHI1MwUXN3mi6uKMmuI11VuZHZuOAXFVASc2W7I6KzYc
-BnB1+sWh1JSUlWxMcVTV7+gZpkhjvfZxLqsVULaDPp/8QvE2A04o4oRUdDmehZAU
-r4XmUDcugJVxgpFcmwjow2fhjOk0KIgITH46dVzCyqCqimvun7HLngi0JYE80srN
-j0yICYAFe93clGs+lKSJbkYzEKP7leDkMFvu/JqA8Ihzdlnhi7+J85Ws1Dxakw0H
-mKt720G7gXNSycv8A9JcWQSNOl3eVFRXYvYngkOklrylrq/hqVgA45f5gXrD2eun
-NMf6Yxpc+zwRBWgIQ1W5ZyYUW30dhtDQdQwxkdgX1cgrSattSNTo3LGTn3YqQQC/
-l/10P/Wcc5/f4qdY3+WjsjlhxDbildaOn3zYlxE7Yrtds67K4/tlDSOh4y8exmlp
-kO39fAqgq9VkFQjeB0j5+KWcVva+uRWZ43SUhto71UxExo2kUtwVlRG70FzWo1Qv
-E1Fd1F5LvPY28uILyMcly6xv86pzlclX9FfREpKZSdBCKTYFXMNpWv7w/Ls/ZbsP
-IeSq/yyceCbb5QF98yDGvgLSSCNtpOFI5NV8N7tbvUcF5AnOuyc3UyVdDJ4cxa+N
-5k7jFhnHGBQnmSaZt5of087vcoJrH3eHgOzsucqIRgQQEQIABgUCVkLsWQAKCRAA
-CSR57+xaZT4mAJ0ftYVyVRU1iO6CfijUa0mOLTxSogCgiiXtZbikqW5EZNJfjiHE
-ZBa5QkGJAiIEEwEKAAwFAlU6r1sFgweGH4AACgkQgQldRk7Pk6FyzA//YqijYVJe
-64ohWRt32tztsLCjPhvxVRU9z97ObBgncdK6NCK/ASyMPwb8dUmw3WWSlquFlr/9
-iFy9r6ltw+oExyH75Yj3jRYVf85KQciRYHms5WfFiIKcXPKnQp7VM3klLYFTN0XH
-cGt2UMsncgxHlBDIWje7nD9uIjyNbI/Jp9AvdWjmUmHfp/y/rdmkKxPYlX7vtZUG
-SxJZA4DiTYY2pJMhxrEj7S91w1XFjU5izmeQNGpgrnyKi3amVF2y0rBcMNkRj7Ix
-GhPcT4/kI63g9LbIxUlHQm0tynKGu2hUIz9MMbYiXFlMrocJrzLLIY2gn/TUbNsp
-rey8tOUzhDKuzYRYNW4dX5o62OCiJmtrZnQhW45DApvtpyIXvrSMINX/1DMT4wGH
-uURpKvFzwt7prjYNSU+3CeQrOkbcqM3ENFbLSGb86MIZid1UeeASY7k/tELBJWIe
-Jjgm247XqHoW48qehnOi1qZ5ZmNoDpU19Zt5EdvtBJ4P0ZnijqXMqJXJKrsH+4aC
-zV6R3MMvn0+5HAjYS8qrJUjcVQx90ike2DXUay4ZThn/feh1lcOG7Qksm2fx8/ZD
-Xw2Gn9sNu1NvhanAYfsg/MSSvwY2BAW0VhwPFtmb7zAODXwy4MM5MhseiXY9gmqB
-E3KU1Vu3JgzVBDIdNfAjEmsXLCkSxOkXGEqJAhwEEwEIAAYFAldZWmUACgkQl7Gv
-yWwe9np8HQ/+MJG052sPoUKk2rsgybmpqIUSM9niPInMtIBUVH5vq7Ow5QMtHSSp
-6pxhCQsdhbc4ywmNbED4+PKmxGFerYS0WxPJfky27kLDOBkYdZAR7MKm/GZI9XuK
-3TmHNXRcdQLkdA0W7Pa/lSmd3oE+qDTad8Uo7s+M62D1dtELUI04g01mbyyvNUrI
-YNp07o6J1s7F0+B9DbVzGXoVyYTsNYpUN6ATKRbr1/4dgG8aRAHX7gJ7qnHuA7U3
-syGTxc/tjMuMD7visMF5/uUdZq5hiyKPSQty2hjYNnGECPQ1dDnvH8uJ8yRQiIck
-h5FRKxkmA7FKtVPSwkYXaE5OGDonGA1bevtGMgLmKY354uHnJ2bE9tMzJLSoFQnY
-IPqkFmaTfA09bNG3qC7utUYpAeG3ftflopjPmss8ZFhDt8yi69TH2kK9gcq2Gt5P
-s7JRluaYas81yoaRs5DVV1aY2zdDQKQOJEly7UUEXEAoKXIvCoTCzjdK79P+4SSy
-PDU/cs9yDIaokdXbSbtgOVNIibykybiSb8HIYC8yUj/OQusfPn3jI7i64k7WlDQJ
-pYnJrqxcjo8xrp0qqVgo2Q8oe3wEBJN//JlPJc8udjxlHby6nspKo02peFKFq2By
-XbbgNtb71zm9IbHRNm+6jTW9i1oyjxUJ46C2FLczbKSUPXhKz6/XCGuJAj0EEwEK
-ACcFAlTZ9yQCGwMFCQeGH4AFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQSjSS
-XQUXKFnfmA/+MA1iAi4g4yuAgFEUXGAU0Mnum1zyxrYwBy9ahEacjNtN7hipNHWi
-Y2LfvocsQ/PO2Mwm/AV0IWpNFtyrZeYu9zQ8ouerwUthEXwDDie9isWJU+OtVUhk
-qLlBMdAVNyobzKElRUPVyLlaLMV8RQ4RHvIejqMRcPulB1JUR6vvj1sAB9c+dRM9
-IamyVWm1i2zlhN9UcZI9Q/uu4bwQdfEq+o3Y+Gn2oVy1gn1sW/ZXECUciNi5kgMN
-JVNiDr/x2M4zknbAMC7NpK1nGbUbHXgvRWlVyvUAUShEyY7Dg3ikXGuYvANX8eEv
-OSN6ZwpSL9uTi67i/IKSJxEJDYGNccyFH1Z6N+JNyOnh6Cs7+Actp/ndKDF97ZNx
-c/mpG7FQKGCOPwGdyvKp9bwQw3GnzjssMMRuqCDYIvy7sm9QWqfQcuDpL4CbqdDl
-SDFYPZ9oAzlTLU2OJ0+apb1whNWTf++fB/EUUVH9pCPakYUaYAix6c5j/6ys7WI/
-w9BzxyVR0rRsOCxRtDlUV3Yy0uHw87nGbdtCLO0v74UeTFzaocP254jpiqRFT8IE
-qDSTGoI4KIQc5PmXS057pWtXFIyyOc8/Tz1z0AlH3jlRVMnkmj/pcIr8f0fsiPwP
-RNAl7f5CjErwgc5SpNHXpRbbBtFLQZcssYa68Zh5qth2XwW+KR3lo165Ag0EVNn3
-JAEQAJMWwEKBSu62T9Cioc92aMDy0nJe/RJTtOE+yHAXO+I9MPOW1vuZ9iX3Jg3V
-8U79u3FjTM6aMlzyvuWjLmiNXE6u/UDpHnxCCeH37Dhkgt2CG4RPxznagd4oJUXA
-lBX2W8SuxXiRaPr/bYMorTTqZlwUGpJNSp8wfIUUfDwvUICr1FxmVkjAS2ixYYMV
-o4v31xTKNiVLZ+nDqamsY2afLwSwCaLCoWA/0o506A3s2gsOjk8d15t3zFOPgUTu
-WPIcqavF0cvqvU3SXg2Q4+NETQJfiUiA1RHlOjPcEYn/PAVZmRasVnhi8Njt1bQc
-akDb2WMNg38/2zV5O+d84sfwIEUjmbP9oiXx5aj6GfNqUA+oHH1O1VdcJvnoQgw1
-oVijFRZnsJjufDHff1cyJNWhxUVrN+/QDzskO7rUAsoUiczHuLjn37DySa2jujmW
-nbzzJk2ulvhAwz8cnpp8fY89K6/zK/uWrQrcUK04vZ3ofagRJBckuJIlRY35hrQJ
-MQDoOk1NthVktyO6zWqLxBa5JNjNakgHydcPzdW/rLVkHI66W/hxzAbxOnzt1jKS
-pmgeLDR7yYuaqyoq327McQ4JgXEsQokC/Sv0W4DIV/VG9rY2vHFfdBbcEoAgJndf
-5xnEF2F6wiifhCHVHOo9ceNNr9896vVs1GDmqmW+4FMnEf1NABEBAAGJAjwEGAEK
-ACYCGwwWIQR+oTnEDByEL51BqvlKNJJdBRcoWQUCXhjaXgUJDuJ9ugAKCRBKNJJd
-BRcoWZ+4D/9PJinTZiL6kEEbOjjFyNj1SimF4bsbhV4HgfXY4meEl9eWsSv7JbM+
-fsCMUkXlKoTefRGR6jaJtvadoCMCdx3Z241AANLMoJ3B7XcNuhNIex9k343+0epZ
-XTtYUJm4/9w6QxoJ0vDIm4d6yqY+3U2u/7LdMl4XlJDs3LadHvsqgXSwWsplwCXd
-DkDrCR1nLDCCnASzrZzZVDAjD8+yIbF9hetKjbxCZVUHt7F9/itA9UXIl3MZ6vEU
-iPNwcWBTuSzYnhH1lgy0sC0WJh2+rhZgsKHSXqn72YKJqtbMwD2nJvBAnwjp0Wjc
-e0BaaXDBjUgai8hEFdP3xfdj6+4BkLqwSQkyePqL87RBtAadBY72JD3EijHq7JFq
-8wtMEz2e1mstO1dSRCZ9p4g8trf4DUeCv7uFz8NaMxIowq8bML/UjZHx/H6Adk+T
-EEYtjkOyY3p0eAWHW91g/72SIeoCw5I+BMtNnCuOtc4/ze1oeK77wxv+Xfdeq+KY
-WbXTHecDU6ob+ykmP6673eeVG8L7Z0W2OJmdljGgm3dzjoSnWeFXT67HojLSXBZc
-hI3LdT2NvFVRmdAZxV89Af/n50YL+WXZMU02gOPprm28bLHm/afhz0KzvuGMcpxU
-4GtDyMbH8oQpl9J/xCeXjiWjqvc7+gQ9nhXmW8meU06+ZMwWibgqbw==
-=RJsJ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gpgkey-D093_0FD2_2220_3ABF_557C__A485_6112_9109_56F6_F8B8.gpg b/gpgkey-D093_0FD2_2220_3ABF_557C__A485_6112_9109_56F6_F8B8.gpg
new file mode 100644
index 0000000..aef3477
Binary files /dev/null and b/gpgkey-D093_0FD2_2220_3ABF_557C__A485_6112_9109_56F6_F8B8.gpg differ
diff --git a/python-cloudflare.spec b/python-cloudflare.spec
index 084112e..63d9468 100644
--- a/python-cloudflare.spec
+++ b/python-cloudflare.spec
@@ -14,21 +14,19 @@
 %endif
 
 Name:           python-%{pypi_name}
-Version:        2.6.5
-Release:        3%{?dist}
+Version:        2.7.1
+Release:        1%{?dist}
 Summary:        Python wrapper for the Cloudflare Client API v4
 
 License:        MIT
 URL:            https://pypi.python.org/pypi/%{pypi_name}
 Source0:        %{pypi_source}
 Source1:        %{pypi_source}.asc
-# upstream mentions https://keybase.io/mahtin as canonical source of release
-# signing key: https://github.com/cloudflare/python-cloudflare/issues/93
-# Key-ID verified via Twitter profile: https://twitter.com/mahtin
-Source2:        https://keybase.io/mahtin/pgp_keys.asc?fingerprint=7ea139c40c1c842f9d41aaf94a34925d05172859#/gpg-7ea139c40c1c842f9d41aaf94a34925d05172859.asc
-# pypi release does not contain man page:
-# https://github.com/cloudflare/python-cloudflare/issues/94
-Source3:        https://raw.githubusercontent.com/cloudflare/python-cloudflare/c2224e4fa466ba8372e2f5898fc299b8923c6c73/cli4/cli4.man
+# upstream confirmed release signing key via github:
+#   https://github.com/cloudflare/python-cloudflare/issues/93
+# gpg2 --recv-keys "D093 0FD2 2220 3ABF 557C  A485 6112 9109 56F6 F8B8"
+# gpg2 --export --export-options export-minimal "D093 0FD2 2220 3ABF 557C  A485 6112 9109 56F6 F8B8" > gpgkey-D093_0FD2_2220_3ABF_557C__A485_6112_9109_56F6_F8B8.gpg
+Source2:        gpgkey-D093_0FD2_2220_3ABF_557C__A485_6112_9109_56F6_F8B8.gpg
 
 # TODO: Remove this once jsonlines is packaged
 Patch0:         remove-jsonlines.patch
@@ -128,7 +126,9 @@ rm -rf build/lib/examples
 %py3_install
 %endif
 
-install -pD %{SOURCE3} %{buildroot}%{_mandir}/man1/cli4.1
+# setuptools installs the man page into /usr/man/ instead of /usr/share/man/
+mkdir --parents %{buildroot}%{_mandir}/man1/
+mv %{buildroot}%{_prefix}/man/man1/cli4* %{buildroot}%{_mandir}/man1/cli4.1
 
 %if %{with python2}
 %files -n python2-%{pypi_name}
@@ -155,6 +155,9 @@ install -pD %{SOURCE3} %{buildroot}%{_mandir}/man1/cli4.1
 %endif
 
 %changelog
+* Wed May 13 2020 Felix Schwarz <fschwarz@fedoraproject.org> - 2.7.1-1
+- update to 2.7.1
+
 * Wed May 06 2020 Felix Schwarz <fschwarz@fedoraproject.org> - 2.6.5-3
 - fix man page
 
diff --git a/remove-jsonlines.patch b/remove-jsonlines.patch
index a5e7d5f..9d3917f 100644
--- a/remove-jsonlines.patch
+++ b/remove-jsonlines.patch
@@ -1,11 +1,11 @@
 diff --git a/setup.py b/setup.py
-index f6f5a03..7852bde 100755
+index ad2e930..8dc0890 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -32,7 +32,7 @@ def main():
          #package_data={'cloudflare-examples': ["examples/*"]},
          include_package_data=True,
-         #data_files = [('man/man1', ['cli4/cli4.man'])],
+         data_files = [('man/man1', ['cli4/cli4.man'])],
 -        install_requires=['requests', 'future', 'pyyaml', 'jsonlines'],
 +        install_requires=['requests', 'future', 'pyyaml'],
          keywords='cloudflare',