diff -Nru yotta-0.20.0/debian/changelog yotta-0.20.5/debian/changelog
--- yotta-0.20.0/debian/changelog	2020-06-19 16:31:23.000000000 +0000
+++ yotta-0.20.5/debian/changelog	2020-07-31 18:35:13.000000000 +0000
@@ -1,3 +1,19 @@
+yotta (0.20.5-2) unstable; urgency=medium
+
+  * d/manpages:
+    - Improve formatting of custom manpage
+
+ -- Nick Morrott <nickm@debian.org>  Fri, 31 Jul 2020 19:35:13 +0100
+
+yotta (0.20.5-1) unstable; urgency=medium
+
+  * New upstream version 0.20.5
+  * d/patches:
+    - Refresh update-cryptography-dependency-version (upstream changes)
+    - Refresh fix-wrong-test-case.patch (lintian)
+
+ -- Nick Morrott <nickm@debian.org>  Fri, 31 Jul 2020 14:54:03 +0100
+
 yotta (0.20.0-2) unstable; urgency=medium
 
   * d/control:
diff -Nru yotta-0.20.0/debian/patches/fix-wrong-test-case.patch yotta-0.20.5/debian/patches/fix-wrong-test-case.patch
--- yotta-0.20.0/debian/patches/fix-wrong-test-case.patch	2020-06-19 16:31:23.000000000 +0000
+++ yotta-0.20.5/debian/patches/fix-wrong-test-case.patch	2020-07-31 18:35:13.000000000 +0000
@@ -1,7 +1,7 @@
 Description: Fix wrong test case
 Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2019-10-29
+Forwarded: not-needed
+Last-Update: 2020-07-31
 
 --- yotta-0.19.0.orig/yotta/test/test_versions.py
 +++ yotta-0.19.0/yotta/test/test_versions.py
diff -Nru yotta-0.20.0/debian/patches/update-cryptography-dependency-version yotta-0.20.5/debian/patches/update-cryptography-dependency-version
--- yotta-0.20.0/debian/patches/update-cryptography-dependency-version	2020-06-19 16:31:23.000000000 +0000
+++ yotta-0.20.5/debian/patches/update-cryptography-dependency-version	2020-07-31 18:35:13.000000000 +0000
@@ -1,7 +1,7 @@
 Description: Remove maximum acceptable version of cryptography module
-Author: Nick Morrott <knowledgejunkie@gmail.com>
+Author: Nick Morrott <nickm@debian.org>
 Forwarded: not-needed
-Last-Update: 2019-08-12
+Last-Update: 2020-07-31
 ---
 --- a/setup.py
 +++ b/setup.py
@@ -9,8 +9,8 @@
          'colorama>=0.3,<0.4',
          'hgapi>=1.7,<2',
          'Jinja2>=2.7.0,<3',
--        'cryptography>=2.1.4,<=2.3',
-+        'cryptography>=2.1.4',
+-        'cryptography>=2.8,<3',
++        'cryptography>=2.8',
          'PyJWT>=1.0,<2.0',
          'pathlib>=1.0.1,<1.1',
          'jsonschema>=2.4.0,<3.0',
diff -Nru yotta-0.20.0/debian/yotta.1.md.in yotta-0.20.5/debian/yotta.1.md.in
--- yotta-0.20.0/debian/yotta.1.md.in	2020-06-19 16:31:23.000000000 +0000
+++ yotta-0.20.5/debian/yotta.1.md.in	2020-07-31 18:35:13.000000000 +0000
@@ -8,8 +8,10 @@
 
 # SYNOPSIS
 
-| **yotta** \[**GLOBAL_OPTION**] **COMMAND** \[**OPTION**]
-| **yotta** \[**COMMAND**] **\-\-help**
+| **yotta** \[**GLOBAL_OPTION**\] **COMMAND** \[**OPTION**\]
+
+| **yotta** \[**COMMAND**\] **\-\-help**
+
 | **yotta** **\-\-version**
 
 # DESCRIPTION
@@ -22,10 +24,10 @@
 
 **yotta** supports both _global arguments_ (that work for all **yotta** commands) and _command-specific options_.
 
-\[GLOBAL_OPTION] COMMAND \[OPTION]
+\[GLOBAL_OPTION\] COMMAND \[OPTION\]
 :   run the specified COMMAND with the optional global and command-specific options
 
-\[COMMAND] \-\-help
+\[COMMAND\] \-\-help
 :   when no command is given, display help for **yotta**, including a list of subcommands; when an optional command is given, display help for the specified subcommand
 
 \-\-version
@@ -35,7 +37,7 @@
 
 **yotta** supports the following global arguments for all _commands_ listed below:
 
-\-\-plain _subcomman>_
+\-\-plain _subcommand_
 :   don’t use coloured output
 
 \-\-noninteractive _subcommand_
@@ -708,4 +710,4 @@
 
 # SEE ALSO
 
-**mbed_test_wrapper(1)**, **mbedhtrun(1)**, **mbedls(1)**, **valinor(1)**, **progen(1)**, **progendef(1)**
+**mbed\_test\_wrapper**(1), **mbedhtrun**(1), **mbedls**(1), **valinor**(1), **progen**(1), **progendef**(1)
diff -Nru yotta-0.20.0/setup.py yotta-0.20.5/setup.py
--- yotta-0.20.0/setup.py	2019-11-17 12:46:27.000000000 +0000
+++ yotta-0.20.5/setup.py	2020-03-06 14:37:32.000000000 +0000
@@ -59,7 +59,7 @@
         'colorama>=0.3,<0.4',
         'hgapi>=1.7,<2',
         'Jinja2>=2.7.0,<3',
-        'cryptography>=2.1.4,<=2.3',
+        'cryptography>=2.8,<3',
         'PyJWT>=1.0,<2.0',
         'pathlib>=1.0.1,<1.1',
         'jsonschema>=2.4.0,<3.0',
diff -Nru yotta-0.20.0/yotta/version.txt yotta-0.20.5/yotta/version.txt
--- yotta-0.20.0/yotta/version.txt	2019-11-17 12:46:27.000000000 +0000
+++ yotta-0.20.5/yotta/version.txt	2020-03-06 14:37:32.000000000 +0000
@@ -1 +1 @@
-0.20.0
+0.20.5