diff --git a/git.rpmlintrc b/git.rpmlintrc
index b2d9407..9fd93ce 100644
--- a/git.rpmlintrc
+++ b/git.rpmlintrc
@@ -7,12 +7,13 @@ addFilter("git-subtree.* spelling-error %description .* (subdirectory|subproject
 # git-core-doc requires git-core, which provides the symlink target
 addFilter("git(-core-doc)?\..*: W: dangling-relative-symlink /usr/share/doc/git/contrib/hooks ../../../git-core/contrib/hooks")
 
-# git requires git-core, which provides the symlink target
-addFilter("git\..*: W: dangling-relative-symlink /usr/libexec/git-core/git-difftool ../../bin/git")
-
 # git-gui requires git, which provides the git binary
 addFilter("git-gui.noarch: W: desktopfile-without-binary /usr/share/applications/git-gui.desktop git")
 
+# ignore no binary warning for main git package; making it noarch isn't trivial
+# since we have arch-specific subpackages
+addFilter("git\..*: E: no-binary$")
+
 # ignore no doc/manpage warnings where we don't expect any documentation
 addFilter("git-(all|core|credential-libsecret)\..*: W: no-documentation")
 addFilter("perl-Git-SVN.noarch: W: no-documentation")
diff --git a/git.spec b/git.spec
index 2ef6a9a..8e9e616 100644
--- a/git.spec
+++ b/git.spec
@@ -97,7 +97,7 @@
 
 Name:           git
 Version:        2.29.2
-Release:        3%{?rcrev}%{?dist}
+Release:        4%{?rcrev}%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 URL:            https://git-scm.com/
@@ -810,7 +810,7 @@ chmod a-x Documentation/technical/api-index.sh
 find contrib -type f -print0 | xargs -r0 chmod -x
 
 # Split core files
-not_core_re="git-(add--interactive|contacts|credential-netrc|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb"
+not_core_re="git-(add--interactive|contacts|credential-netrc|filter-branch|instaweb|request-pull|send-mail)|gitweb"
 grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core
 touch man-doc-files-core
 %if %{with docs}
@@ -1089,6 +1089,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Sun Dec 06 2020 Todd Zullinger <tmz@pobox.com> - 2.29.2-4
+- move git-difftool to git-core, it does not require perl
+
 * Wed Nov 25 2020 Todd Zullinger <tmz@pobox.com> - 2.29.2-3
 - apply upstream patch to resolve git fast-import memory leak (#1900335)
 - add epel-rpm-macros BuildRequires on EL-7 (#1872865)