diff --git a/SOURCES/setup-2.12.2-set-lang-as-env-var.patch b/SOURCES/setup-2.12.2-set-lang-as-env-var.patch
new file mode 100644
index 0000000..f92e99e
--- /dev/null
+++ b/SOURCES/setup-2.12.2-set-lang-as-env-var.patch
@@ -0,0 +1,13 @@
+diff --git a/lang.csh b/lang.csh
+index 94c4625..4e5f014 100644
+--- a/lang.csh
++++ b/lang.csh
+@@ -13,7 +13,7 @@ foreach config (/etc/locale.conf "${HOME}/.i18n")
+ end
+ 
+ if (${?LANG_backup}) then
+-    set LANG="${LANG_backup}"
++    setenv LANG "${LANG_backup}"
+ endif
+ 
+ unset LANG_backup config
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 77bd89b..4a1e1ad 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.12.2
-Release: 7%{?dist}
+Release: 9%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://pagure.io/setup/
@@ -21,6 +21,7 @@ Patch5: setup-2.12.2-use-full-path-for-non-builtins.patch
 Patch6: setup-2.12.2-nrpe-services.patch
 Patch7: setup-2.12.2-csh.login-unset-p.patch
 Patch8: setup-2.12.2-bashrc-remove-VTE-specific-PROMPT_COMMAND.patch
+Patch9: setup-2.12.2-set-lang-as-env-var.patch
 
 %description
 The setup package contains a set of important system configuration and
@@ -37,6 +38,7 @@ setup files, such as passwd, group, and profile.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 ./shadowconvert.sh
 
@@ -124,6 +126,12 @@ end
 /etc/dnf/protected.d/%{name}.conf
 
 %changelog
+* Mon Nov 28 2022 Martin Osvald <mosvald@redhat.com> - 2.12.2-9
+- Add missing %patch macro
+
+* Sat Nov 26 2022 Martin Osvald <mosvald@redhat.com> - 2.12.2-8
+- Don't set LANG as a per-shell variable (#2029787)
+
 * Mon May 09 2022 Martin Osvald <mosvald@redhat.com> - 2.12.2-7
 - Move /var/log/lastlog ownership to systemd (#2044589)
 - tcsh sets variable p to /usr/sbin from /etc/csh.login (#1945400)