diff --git a/srcpkgs/mairix/patches/issue5.patch b/srcpkgs/mairix/patches/issue5.patch
new file mode 100644
index 00000000000..6d80bfd2e8a
--- /dev/null
+++ b/srcpkgs/mairix/patches/issue5.patch
@@ -0,0 +1,21 @@
+From e9eb22f4cdebd7e262007d795fd3d0341dccc174 Mon Sep 17 00:00:00 2001
+From: Kim Vandry <vandry@TZoNE.ORG>
+Date: Mon, 14 Aug 2017 22:08:25 +0100
+Subject: [PATCH] Fix another regression with nvp parsing introduced in 1305fc1
+
+If we get two terminators in a row, don't carry out last_action twice.
+
+Fixes vandry/mairix#5
+
+--- nvp.c
++++ nvp.c
+@@ -307,6 +307,9 @@ struct nvp *make_nvp(struct msg_src *src, char *s, const char *pfx)/*{{{*/
+           default:
+             break;
+         }
++        /* Clear last_action so we don't repeat the action if we
++           get another terminator immediately. */
++        last_action = GOT_NOTHING;
+         break;
+       case GOT_NOTHING:
+
diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index 7177ec2a49b..8efeaf61579 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,14 +1,14 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=4
+revision=5
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
 makedepends="bzip2-devel libressl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/vandry/mairix"
 distfiles="https://github.com/vandry/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
 checksum=a0702e079c768b6fbe25687ebcbabe7965eb493d269a105998c7c1c2caef4a57