diff --git a/SOURCES/bashrc-remove-VTE-specific-PROMPT_COMMAND.patch b/SOURCES/bashrc-remove-VTE-specific-PROMPT_COMMAND.patch
new file mode 100644
index 0000000..ba98fac
--- /dev/null
+++ b/SOURCES/bashrc-remove-VTE-specific-PROMPT_COMMAND.patch
@@ -0,0 +1,13 @@
+diff --git a/bashrc b/bashrc
+index d19a7c1..d462ac7 100644
+--- a/bashrc
++++ b/bashrc
+@@ -19,8 +19,6 @@ if [ -z "$BASHRCSOURCED" ]; then
+       xterm*|vte*)
+         if [ -e /etc/sysconfig/bash-prompt-xterm ]; then
+             PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm
+-        elif [ "${VTE_VERSION:-0}" -ge 3405 ]; then
+-            PROMPT_COMMAND="__vte_prompt_command"
+         else
+             PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+         fi
diff --git a/SOURCES/csh.login-unset-p.patch b/SOURCES/csh.login-unset-p.patch
new file mode 100644
index 0000000..42654df
--- /dev/null
+++ b/SOURCES/csh.login-unset-p.patch
@@ -0,0 +1,12 @@
+diff --git a/csh.login b/csh.login
+index e4b1990..18c5136 100644
+--- a/csh.login
++++ b/csh.login
+@@ -23,6 +23,7 @@ else
+ 			breaksw
+ 		endsw
+ 	end
++	unset p
+ endif
+ 
+ setenv HOSTNAME `/usr/bin/hostname`
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 5a5a063..6487b8a 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.13.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://pagure.io/setup/
@@ -16,6 +16,8 @@ Conflicts: filesystem < 3
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21
 
 Patch0:    setup-hostname.patch
+Patch1:    csh.login-unset-p.patch
+Patch2:    bashrc-remove-VTE-specific-PROMPT_COMMAND.patch
 
 %description
 The setup package contains a set of important system configuration and
@@ -40,11 +42,9 @@ mv %{buildroot}/etc/lang* %{buildroot}/etc/profile.d/
 rm -f %{buildroot}/etc/uidgid
 rm -f %{buildroot}/etc/COPYING
 mkdir -p %{buildroot}/var/log
-touch %{buildroot}/var/log/lastlog
 touch %{buildroot}/etc/environment
 chmod 0644 %{buildroot}/etc/environment
 chmod 0400 %{buildroot}/etc/{shadow,gshadow}
-chmod 0644 %{buildroot}/var/log/lastlog
 touch %{buildroot}/etc/fstab
 mkdir -p %{buildroot}/etc/profile.d
 echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local
@@ -113,11 +113,15 @@ end
 %config(noreplace) /etc/profile.d/csh.local
 /etc/profile.d/lang.{sh,csh}
 %config(noreplace) %verify(not md5 size mtime) /etc/shells
-%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Mon May 09 2022 Martin Osvald <mosvald@redhat.com> - 2.13.7-7
+- Move /var/log/lastlog ownership to systemd (#2066753)
+- tcsh sets variable p to /usr/sbin from /etc/csh.login (#2066767)
+- bashrc: Don't set up VTE-specific PROMPT_COMMAND (#2026892)
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.7-6
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688