diff --git a/.setup.metadata b/.setup.metadata
new file mode 100644
index 0000000..f74d77e
--- /dev/null
+++ b/.setup.metadata
@@ -0,0 +1 @@
+a1120010a76a7415975de6a977114e0805063b60 setup-2.13.7.tar.bz2
diff --git a/csh.login-source-csh.local.patch b/csh.login-source-csh.local.patch
new file mode 100644
index 0000000..26e0fca
--- /dev/null
+++ b/csh.login-source-csh.local.patch
@@ -0,0 +1,13 @@
+diff --git a/csh.login b/csh.login
+index 18c5136..3a8e5ce 100644
+--- a/csh.login
++++ b/csh.login
+@@ -31,7 +31,7 @@ set history=1000
+ 
+ if ( -d /etc/profile.d ) then
+         set nonomatch
+-        foreach i ( /etc/profile.d/*.csh )
++        foreach i ( /etc/profile.d/*.csh /etc/profile.d/csh.local )
+                 if ( -r "$i" ) then
+ 	                        if ($?prompt) then
+ 	                              source "$i"
diff --git a/setup.spec b/setup.spec
index 14a731c..f3307e6 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.13.7
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://pagure.io/setup/
@@ -19,6 +19,7 @@ Patch0:    setup-hostname.patch
 Patch1:    csh.login-unset-p.patch
 Patch2:    bashrc-remove-VTE-specific-PROMPT_COMMAND.patch
 Patch3:    dont-set-hardcoded-umask.patch
+Patch4:    csh.login-source-csh.local.patch
 
 %description
 The setup package contains a set of important system configuration and
@@ -126,6 +127,9 @@ end
 /etc/dnf/protected.d/%{name}.conf
 
 %changelog
+* Wed Feb 07 2024 Martin Osvald <mosvald@redhat.com> - 2.13.7-10
+- csh.login: Add csh.local into foreach loop (RHEL-17226)
+
 * Wed Dec 21 2022 Martin Osvald <mosvald@redhat.com> - 2.13.7-9
 - make setup protected package (#2155529)