diff --git a/0001-Set-client-keytab-location-for-389ds.patch b/0001-Set-client-keytab-location-for-389ds.patch
new file mode 100644
index 0000000..a22f4d2
--- /dev/null
+++ b/0001-Set-client-keytab-location-for-389ds.patch
@@ -0,0 +1,29 @@
+From df411f00a3d1db2fcb0d122a54b9e13a57e35f3f Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Fri, 8 Jan 2021 11:43:31 -0500
+Subject: [PATCH] Set client keytab location for 389ds
+
+Handles behavior change in
+https://github.com/389ds/389-ds-base/pull/4523
+
+Fixes: https://pagure.io/freeipa/issue/8656
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ install/share/ds-ipa-env.conf.template | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/install/share/ds-ipa-env.conf.template b/install/share/ds-ipa-env.conf.template
+index f5ce11a9a..c059aae15 100644
+--- a/install/share/ds-ipa-env.conf.template
++++ b/install/share/ds-ipa-env.conf.template
+@@ -3,4 +3,5 @@
+ [Service]
+ Environment=LC_ALL=C.UTF-8
+ Environment=KRB5_KTNAME=$KRB5_KTNAME
++Environment=KRB5_CLIENT_KTNAME=$KRB5_KTNAME
+ Environment=KRB5CCNAME=$KRB5CCNAME
+-- 
+2.26.2
+
diff --git a/freeipa.spec b/freeipa.spec
index 121c772..913c731 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -176,7 +176,7 @@
 
 Name:           %{package_name}
 Version:        %{IPA_VERSION}
-Release:        1%{?rc_version:.%rc_version}%{?dist}
+Release:        2%{?rc_version:.%rc_version}%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 License:        GPLv3+
@@ -201,6 +201,7 @@ Patch1003:      1003-Revert-WebUI-use-python3-rjsmin-to-minify-JavaScript.patch
 %endif
 # RHEL spec file only: END
 
+Patch0001:      0001-Set-client-keytab-location-for-389ds.patch
 # For the timestamp trick in patch application
 BuildRequires:  diffstat
 
@@ -1674,6 +1675,9 @@ fi
 %endif
 
 %changelog
+* Wed Jan 20 2021 Rob Crittenden <rcritten@redhat.com> - 4.9.0-2
+- Set client keytab location for 389ds (RHBZ#1918075)
+
 * Wed Dec 23 17:05:00 EET 2020 Alexander Bokovoy <abokovoy@redhat.com> - 4.9.0-1
 - FreeIPA 4.9.0 final release