diff --git a/pkcs11-helper-rfc7512.patch b/pkcs11-helper-rfc7512.patch
index 8d64569..84fba08 100644
--- a/pkcs11-helper-rfc7512.patch
+++ b/pkcs11-helper-rfc7512.patch
@@ -1,4 +1,4 @@
-commit 8b614fd9554d3b372a829e4a05e21c5899f581ca
+commit 90590b02085edc3830bdfe0942a46c4e7bf3f1ab (HEAD -> master)
 Author: David Woodhouse <David.Woodhouse@intel.com>
 Date:   Thu Apr 30 14:58:24 2015 +0100
 
@@ -6,7 +6,7 @@ Date:   Thu Apr 30 14:58:24 2015 +0100
     
     Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
 
-commit db7a561668614b16b3a14564b3b4f71912db8e17
+commit 4d5280da8df591aab701dff4493d13a835a9b29c
 Author: David Woodhouse <David.Woodhouse@intel.com>
 Date:   Wed Dec 10 14:00:21 2014 +0000
 
@@ -16,7 +16,7 @@ Date:   Wed Dec 10 14:00:21 2014 +0000
     
     Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
 
-commit 7f89de7690edc3dfbd4eb70ad457814a2489a5bc
+commit 14e09211c3d50eb06825090c9765e4382cf52f19
 Author: David Woodhouse <David.Woodhouse@intel.com>
 Date:   Sun Dec 14 19:42:18 2014 +0000
 
@@ -67,7 +67,7 @@ index ad275f8..1d077e4 100644
 +	int len = 0, i;
 +
 +	for (i = 0; i < attrlen; i++) {
-+		if (strchr(P11_URL_VERBATIM, attr[i])) {
++		if ((attr[i] != '\x0') && strchr(P11_URL_VERBATIM, attr[i])) {
 +			if (uri) {
 +				*(uri++) = attr[i];
 +			}
diff --git a/pkcs11-helper.spec b/pkcs11-helper.spec
index cc47cf6..dc9ecc1 100644
--- a/pkcs11-helper.spec
+++ b/pkcs11-helper.spec
@@ -1,6 +1,6 @@
 Name:           pkcs11-helper
 Version:        1.22
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A library for using PKCS#11 providers
 
 License:        GPLv2 or BSD
@@ -72,6 +72,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Fri Apr 24 2020 David Woodhouse <dwmw2@infradead.org> - 1.22-10
+- Fix serialisation of attributes with NUL bytes in (#1825496)
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild