diff --git a/git.spec b/git.spec
index 49c55d0..1193789 100644
--- a/git.spec
+++ b/git.spec
@@ -149,6 +149,7 @@ BuildRequires:  rubygem-asciidoctor
 BuildRequires:  asciidoc >= 8.4.1
 %endif
 # endif with asciidoctor
+BuildRequires:  perl(File::Compare)
 BuildRequires:  xmlto
 %if %{with linkcheck}
 BuildRequires:  linkchecker
@@ -178,6 +179,7 @@ BuildRequires:  openssl-devel
 BuildRequires:  pcre2-devel
 BuildRequires:  perl(Error)
 BuildRequires:  perl(lib)
+BuildRequires:  perl(Test)
 %if %{use_perl_generators}
 BuildRequires:  perl-generators
 %endif
@@ -230,7 +232,7 @@ BuildRequires:  glibc-langpack-is
 BuildRequires:  gnupg2-smime
 %endif
 # endif fedora or el >= 9
-%if 0%{?fedora} || 0%{?rhel} >= 8 || ( 0%{?rhel} == 7 && ( "%{_arch}" == "ppc64le" || "%{_arch}" == "x86_64" ) )
+%if 0%{?fedora} || ( 0%{?rhel} >= 7 && ( "%{_arch}" == "ppc64le" || "%{_arch}" == "x86_64" ) )
 BuildRequires:  highlight
 %endif
 # endif fedora or el7+ (ppc64le/x86_64)
@@ -434,7 +436,9 @@ Summary:        Git repository browser
 BuildArch:      noarch
 Requires:       git = %{version}-%{release}
 Requires:       git-gui = %{version}-%{release}
-Requires:       tk
+# Keep gitk on tcl/tk 8.x until its ready for 9 (also see below in config.mk)
+# https://github.com/j6t/gitk/issues/5
+Requires:       tk8 >= 8.4
 %description -n gitk
 %{summary}.
 
@@ -592,6 +596,10 @@ gitwebdir = %{_localstatedir}/www/git
 DEFAULT_TEST_TARGET = prove
 GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} --formatter=TAP::Formatter::File
 GIT_TEST_OPTS = -x --verbose-log
+
+# Keep gitk on tcl/tk 8.x until its ready for 9 (see more above in gitk requires)
+TCLTK_PATH = wish8
+TCL_PATH = tclsh8
 EOF
 
 # Filter bogus perl requires
@@ -1047,9 +1055,6 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 * Thu Oct 23 2025 Ondřej Pohořelský <opohorel@redhat.com> - 2.51.1-1
 - update to 2.51.1
 
-* Sun Oct 12 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 2.51.0-3
-- Revbump for tcl/tk 9
-
 * Thu Aug 21 2025 Ondřej Pohořelský <opohorel@redhat.com> - 2.51.0-2
 - exclude sample hook files from automatic dependency detection