diff --git a/opencryptoki-pkcsslotd-pidfile.patch b/opencryptoki-pkcsslotd-pidfile.patch
new file mode 100644
index 0000000..8af4d96
--- /dev/null
+++ b/opencryptoki-pkcsslotd-pidfile.patch
@@ -0,0 +1,12 @@
+diff -up opencryptoki-3.16.0/misc/pkcsslotd.service.in.me opencryptoki-3.16.0/misc/pkcsslotd.service.in
+--- opencryptoki-3.16.0/misc/pkcsslotd.service.in.me	2021-06-25 09:25:11.464487847 +0200
++++ opencryptoki-3.16.0/misc/pkcsslotd.service.in	2021-06-25 09:25:38.701225760 +0200
+@@ -4,7 +4,7 @@ After=local-fs.target
+ 
+ [Service]
+ Type=forking
+-PIDFile=/var/run/pkcsslotd.pid
++PIDFile=/run/pkcsslotd.pid
+ ExecStart=@sbindir@/pkcsslotd
+ 
+ [Install]
diff --git a/opencryptoki.spec b/opencryptoki.spec
index 1d74693..2eda83a 100644
--- a/opencryptoki.spec
+++ b/opencryptoki.spec
@@ -1,7 +1,7 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
 Version:		3.16.0
-Release:		5%{?dist}
+Release:		6%{?dist}
 License:		CPL
 URL:			https://github.com/opencryptoki/opencryptoki
 Source0:		https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -12,6 +12,9 @@ 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
+
 # Use --no-undefined to debug missing symbols
 #Patch100:			%%{name}-3.2-no-undefined.patch
 
@@ -337,6 +340,9 @@ fi
 
 
 %changelog
+* Fri Jun 25 2021 Than Ngo <than@redhat.com> - 3.16.0-6
+- Resolves: #1974693, pkcsslotd PIDfile below legacy directory /var/run/
+
 * Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.16.0-5
 - Rebuilt for RHEL 9 BETA for openssl 3.0
   Related: rhbz#1971065