diff --git a/opencryptoki-3.17.0-p11sak.patch b/opencryptoki-3.17.0-p11sak.patch
new file mode 100644
index 0000000..62ccf2a
--- /dev/null
+++ b/opencryptoki-3.17.0-p11sak.patch
@@ -0,0 +1,12 @@
+diff -up opencryptoki-3.17.0/Makefile.am.me opencryptoki-3.17.0/Makefile.am
+--- opencryptoki-3.17.0/Makefile.am.me	2021-11-09 09:45:49.032661898 +0100
++++ opencryptoki-3.17.0/Makefile.am	2021-11-09 09:46:41.353400986 +0100
+@@ -76,7 +76,7 @@ if ENABLE_EP11TOK
+ endif
+ if ENABLE_P11SAK
+ 	test -f $(DESTDIR)$(sysconfdir)/opencryptoki || $(MKDIR_P) $(DESTDIR)$(sysconfdir)/opencryptoki || true
+-	test -f $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || $(INSTALL) -g pkcs11 -m 0640 $(srcdir)/usr/sbin/p11sak/p11sak_defined_attrs.conf $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || true
++	test -f $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || $(INSTALL) -m 0644 $(srcdir)/usr/sbin/p11sak/p11sak_defined_attrs.conf $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || true
+ endif
+ if ENABLE_ICATOK
+ 	cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
diff --git a/opencryptoki.spec b/opencryptoki.spec
index ec1dc10..2dd3a2c 100644
--- a/opencryptoki.spec
+++ b/opencryptoki.spec
@@ -1,18 +1,16 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v3.0
 Version:		3.17.0
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		CPL
 URL:			https://github.com/opencryptoki/opencryptoki
 Source0:		https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 # https://bugzilla.redhat.com/show_bug.cgi?id=732756
 Patch0:			opencryptoki-3.11.0-group.patch
-
 # bz#1373833, change tmpfiles snippets from /var/lock/* to /run/lock/*
 Patch1:			opencryptoki-3.11.0-lockdir.patch
-# PIDfile below legacy directory /var/run/
-Patch2:			opencryptoki-pkcsslotd-pidfile.patch
-
+# add missing p11sak_defined_attrs.conf
+Patch2:			opencryptoki-3.17.0-p11sak.patch
 # upstream patches
 
 Requires(pre):		coreutils
@@ -317,6 +315,9 @@ fi
 
 
 %changelog
+* Wed Nov 24 2021 Than Ngo <than@redhat.com> - 3.17.0-2
+- Related: #2015888, add missing p11sak_defined_attrs.conf
+
 * Wed Nov 03 2021 Than Ngo <than@redhat.com> - 3.17.0-1
 - Resolves: #2015888, rebase to 3.17.0
 - Resolves: #2017720, openCryptoki key management tool