diff --git a/cronie-pam_config-nonlogin.diff b/cronie-pam_config-nonlogin.diff
new file mode 100644
index 0000000..a35a439
--- /dev/null
+++ b/cronie-pam_config-nonlogin.diff
@@ -0,0 +1,12 @@
+---
+ pam/crond |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/pam/crond
++++ b/pam/crond
+@@ -10,4 +10,4 @@ auth     include        common-auth
+ account  include        common-account
+ password include        common-password
+ session  optional       pam_keyinit.so force revoke
+-session  include        common-session
++session  include        common-session-nonlogin
diff --git a/cronie.changes b/cronie.changes
index b625a54..97f08de 100644
--- a/cronie.changes
+++ b/cronie.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 31 13:54:41 UTC 2023 - Michal Koutný <mkoutny@suse.com>
+
+- PAM: Use common-session-nonlogin for >15 codestreams
+  More info in https://github.com/SUSE/pam-config/pull/16
+
 -------------------------------------------------------------------
 Tue Dec 20 16:10:11 UTC 2022 - Stefan Schubert <schubi@suse.com>
 
diff --git a/cronie.spec b/cronie.spec
index fefa482..6fe7fd3 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cronie
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -46,6 +46,8 @@ Patch5:         cronie-crond_pid.diff
 # PATCH-FIX-SUSE the first occurance of "/etc/anacrontab" was replaced by "/etc/crontab"
 # in manpage file because the /etc/crontab is still used in SUSE.
 Patch13:        fix-manpage-replace-anacrontab-with-crontab.patch
+# PATCH-FEATURE-OPENSUSE user common-session-nonlogin
+Patch14:        cronie-pam_config-nonlogin.diff
 BuildRequires:  audit-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -104,6 +106,9 @@ overloaded in settings.
 %patch5 -p1
 cp %{SOURCE7} ./cron_to_cronie.README
 %patch13 -p1
+%if 0%{?suse_version} > 1500
+%patch14 -p1
+%endif
 
 %build
 # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked