diff --git a/doc/NEWS b/doc/NEWS
index e2789a3..aaace3f 100644
--- a/doc/NEWS
+++ b/doc/NEWS
@@ -1,4 +1,4 @@
-1.6.20 - NOT YET RELEASED
+1.6.20 - 12 September 2021
   - fix: add missing stddef.h include to number.c (Sam James)
 
 1.6.19 - 5 September 2021
diff --git a/doc/lsm.in b/doc/lsm.in
index 5480ec8..afa890a 100644
--- a/doc/lsm.in
+++ b/doc/lsm.in
@@ -1,7 +1,7 @@
 Begin3
 Title:		@PACKAGE@
 Version:	@VERSION@
-Entered-date:	08SEP21
+Entered-date:	12SEP21
 Description:	A tool for monitoring the progress of data through a
 		pipeline.  It can be inserted into any normal pipeline
 		between two processes to give a visual indication of how
diff --git a/doc/spec.in b/doc/spec.in
index f3cca95..279687f 100644
--- a/doc/spec.in
+++ b/doc/spec.in
@@ -46,7 +46,7 @@ make test
 %doc README doc/NEWS doc/TODO doc/COPYING
 
 %changelog
-* Wed Sep  8 2021 Andrew Wood <andrew.wood@ivarch.com> 1.6.20-1
+* Sun Sep 12 2021 Andrew Wood <andrew.wood@ivarch.com> 1.6.20-1
 - fix: add missing stddef.h include to number.c (Sam James)
 
 * Sun Sep  5 2021 Andrew Wood <andrew.wood@ivarch.com> 1.6.19-1
diff --git a/src/nls/de.po b/src/nls/de.po
index d265ff5..9ee93b3 100644
--- a/src/nls/de.po
+++ b/src/nls/de.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 19:25+0100\n"
+"POT-Creation-Date: 2021-09-12 17:13+0100\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Date: 1999-06-01 15:18:29+0100\n"
 "From: Andrew Wood <ivarch@ubik>\n"
diff --git a/src/nls/fr.po b/src/nls/fr.po
index e1f13ec..79b751e 100644
--- a/src/nls/fr.po
+++ b/src/nls/fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 19:25+0100\n"
+"POT-Creation-Date: 2021-09-12 17:13+0100\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Date: 1999-06-01 15:18:29+0100\n"
 "From: Andrew Wood <ivarch@ubik>\n"
diff --git a/src/nls/pl.po b/src/nls/pl.po
index ee53ca0..04cfd4f 100644
--- a/src/nls/pl.po
+++ b/src/nls/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 19:25+0100\n"
+"POT-Creation-Date: 2021-09-12 17:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/nls/pt.po b/src/nls/pt.po
index f95cd95..7e95cc4 100644
--- a/src/nls/pt.po
+++ b/src/nls/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 19:25+0100\n"
+"POT-Creation-Date: 2021-09-12 17:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/nls/pv.pot b/src/nls/pv.pot
index 1094ba8..d9f8421 100644
--- a/src/nls/pv.pot
+++ b/src/nls/pv.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-05 19:25+0100\n"
+"POT-Creation-Date: 2021-09-12 17:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/pv/display.c b/src/pv/display.c
index 5b4fcad..aff643b 100644
--- a/src/pv/display.c
+++ b/src/pv/display.c
@@ -269,8 +269,8 @@ static void pv__format_init(pvstate_t state)
 	}
 
 	formatstr =
-	    state->format_string ? state->format_string : state->
-	    default_format;
+	    state->format_string ? state->
+	    format_string : state->default_format;
 
 	state->components_used = 0;
 
diff --git a/src/pv/loop.c b/src/pv/loop.c
index c006d22..f1c5989 100644
--- a/src/pv/loop.c
+++ b/src/pv/loop.c
@@ -533,8 +533,8 @@ int pv_watchpid_loop(pvstate_t state)
 	 * it's not present.
 	 */
 	original_format_string =
-	    state->format_string ? state->format_string : state->
-	    default_format;
+	    state->format_string ? state->
+	    format_string : state->default_format;
 	if (NULL == strstr(original_format_string, "%N")) {
 #ifdef HAVE_SNPRINTF
 		snprintf(new_format_string, sizeof(new_format_string) - 1,