diff --git a/pkcs11-helper-rfc7512.patch b/pkcs11-helper-rfc7512.patch
index a4cf0e8..8d64569 100644
--- a/pkcs11-helper-rfc7512.patch
+++ b/pkcs11-helper-rfc7512.patch
@@ -238,7 +238,7 @@ index ad275f8..1d077e4 100644
 +		uri++;
 +		toklen--;
 +		urilen--;
-+		tokstr[1] = 0;
++		tokstr[0] = 0;
  	}
  
 -	if (sz != NULL) {
diff --git a/pkcs11-helper.spec b/pkcs11-helper.spec
index 2ec53fc..a012ca9 100644
--- a/pkcs11-helper.spec
+++ b/pkcs11-helper.spec
@@ -1,6 +1,6 @@
 Name:           pkcs11-helper
 Version:        1.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library for using PKCS#11 providers
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Fri Nov 24 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.22-4
+- Addressed issue with RFC7512 URI parsing (#1516474)
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild