diff --git a/0018-Fix-meridian-type-in-kadmin-datetime-parser.patch b/0018-Fix-meridian-type-in-kadmin-datetime-parser.patch
new file mode 100644
index 0000000..2973380
--- /dev/null
+++ b/0018-Fix-meridian-type-in-kadmin-datetime-parser.patch
@@ -0,0 +1,36 @@
+From 604fce63b468d0efce4438df4ba0286f00bfce8d Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Tue, 21 Feb 2023 10:03:35 +0100
+Subject: [PATCH] Fix meridian type in kadmin datetime parser
+
+The meridian suffix is typed as "Number" in kadmin YACC file for
+datetime parsing, while it should be using the "Meridian" enumeration
+one.
+
+This results in invalid Meridian value on 64-bit IBM zSystems (s390x),
+causing core dumped errors on most kadmin commands where meridian
+suffices are used.
+
+Upstream PR:
+https://github.com/krb5/krb5/pull/1290
+---
+ src/kadmin/cli/getdate.y | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
+index b9dceec1ee..d14cf963c5 100644
+--- a/src/kadmin/cli/getdate.y
++++ b/src/kadmin/cli/getdate.y
+@@ -181,7 +181,8 @@ static time_t	yyRelSeconds;
+ 
+ %token			tAGO tID tDST tNEVER
+ %token	<Number>	tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT
+-%token	<Number>	tSEC_UNIT tSNUMBER tUNUMBER tZONE tMERIDIAN
++%token	<Number>	tSEC_UNIT tSNUMBER tUNUMBER tZONE
++%token	<Meridian>	tMERIDIAN
+ %type	<Meridian>	o_merid
+ 
+ %%
+-- 
+2.39.1
+
diff --git a/krb5.spec b/krb5.spec
index 5098d15..7ac7935 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -34,7 +34,7 @@
 #
 # baserelease is what we have standardized across Fedora and what
 # rpmdev-bumpspec knows how to handle.
-%global baserelease 7
+%global baserelease 8
 
 # This should be e.g. beta1 or %%nil
 %global pre_release %nil
@@ -100,6 +100,7 @@ Patch14: 0014-downstream-Do-not-set-root-as-ksu-file-owner.patch
 Patch15: 0015-downstream-Allow-KRB5KDF-MD5-and-MD4-in-FIPS-mode.patch
 Patch16: 0016-Add-PAC-full-checksums.patch
 Patch17: 0017-Fix-possible-double-free-during-KDB-creation.patch
+Patch18: 0018-Fix-meridian-type-in-kadmin-datetime-parser.patch
 
 License: MIT
 URL: https://web.mit.edu/kerberos/www/
@@ -664,6 +665,10 @@ exit 0
 %{_libdir}/libkadm5srv_mit.so.*
 
 %changelog
+* Wed Feb 22 2023 Julien Rische <jrische@redhat.com> - 1.20.1-8
+- Fix datetime parsing in kadmin on s390x
+- Resolves: rhbz#2169985
+
 * Tue Feb 14 2023 Julien Rische <jrische@redhat.com> - 1.20.1-7
 - Fix double free on kdb5_util key creation failure
 - Resolves: rhbz#2166603