diff --git a/.gitignore b/.gitignore
index 0e78767..d126521 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,10 @@
-SOURCES/git-2.39.1.tar.xz
-SOURCES/gpgkey-junio.asc
-/git-2.39.1.tar.xz
-/git-2.39.3.tar.xz
-/git-2.39.3.tar.sign
+*~
+*.gpg
+*.rpm
+*.sign
+*.tar.xz
+/.build*.log
+/git-*/
+/results_git/
+/git-2.18.2.tar.gz
+/git-2.18.4.tar.gz
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..88615c5
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,18 @@
+<atkac@redhat.com> <atkac@fedoraproject.org>
+<atkac@redhat.com> <vonsch@gmail.com>
+<bernie@codewiz.org> <bernie@fedoraproject.org>
+<Christian.Iseli@licr.org> <c4chris@fedoraproject.org>
+<dennis@ausil.us> <ausil@fedoraproject.org>
+<dwmw2@infradead.org> <David.Woodhouse@intel.com>
+James Bowes <jbowes@redhat.com> <jbowes@fedoraproject.org>
+<jkeating@redhat.com> <jkeating@fedoraproject.org>
+Josh Boyer <jwboyer@gmail.com> <jwboyer@fedoraproject.org>
+<katzj@redhat.com> <katzj@fedoraproject.org>
+<lkundrak@redhat.com> <lkundrak@fedoraproject.org>
+<mmaslano@redhat.com> <mmaslano@fedoraproject.org>
+<releng@fedoraproject.org> <rel-eng@lists.fedoraproject.org>
+<skasal@redhat.com> <kasal@fedoraproject.org>
+<tmraz@redhat.com> <tmraz@fedoraproject.org>
+<tmz@pobox.com> <tmz@fedoraproject.org>
+<ville.skytta@iki.fi> <scop@fedoraproject.org>
+<xavier@bachelot.org> <xavierb@fedoraproject.org>
diff --git a/0001-Switch-git-instaweb-default-to-apache.patch b/0001-Switch-git-instaweb-default-to-apache.patch
new file mode 100644
index 0000000..6d9d21c
--- /dev/null
+++ b/0001-Switch-git-instaweb-default-to-apache.patch
@@ -0,0 +1,43 @@
+From aebe9c096f7150eee901fcc59036a89c54c26a0b Mon Sep 17 00:00:00 2001
+From: Sebastian Kisela <skisela@redhat.com>
+Date: Mon, 16 Jul 2018 08:54:00 +0200
+Subject: [PATCH] Switch instaweb default HTTP daemon to httpd
+
+---
+ git-instaweb.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/git-instaweb.sh b/git-instaweb.sh
+index 47e38f3..e089f0d 100755
+--- a/git-instaweb.sh
++++ b/git-instaweb.sh
+@@ -36,7 +36,7 @@ conf="$GIT_DIR/gitweb/httpd.conf"
+ # Defaults:
+ 
+ # if installed, it doesn't need further configuration (module_path)
+-test -z "$httpd" && httpd='lighttpd -f'
++test -z "$httpd" && httpd='httpd -f'
+ 
+ # Default is @@GITWEBDIR@@
+ test -z "$root" && root='@@GITWEBDIR@@'
+@@ -332,6 +332,8 @@ apache2_conf () {
+ 			module_path="/usr/lib/httpd/modules"
+ 		test -d "/usr/lib/apache2/modules" &&
+ 			module_path="/usr/lib/apache2/modules"
++		test -d "/etc/httpd/modules" &&
++			module_path="/etc/httpd/modules"
+ 	fi
+ 	bind=
+ 	test x"$local" = xtrue && bind='127.0.0.1:'
+@@ -356,7 +358,7 @@ EOF
+ 			break
+ 		fi
+ 	done
+-	for mod in mime dir env log_config authz_core
++	for mod in mime dir env log_config authz_core unixd
+ 	do
+ 		if test -e $module_path/mod_${mod}.so
+ 		then
+-- 
+2.14.4
+
diff --git a/git-2.39.1.tar.sign b/git-2.39.1.tar.sign
deleted file mode 100644
index e6ed440..0000000
Binary files a/git-2.39.1.tar.sign and /dev/null differ
diff --git a/git.rpmlintrc b/git.rpmlintrc
new file mode 100644
index 0000000..ac48b56
--- /dev/null
+++ b/git.rpmlintrc
@@ -0,0 +1,23 @@
+from Config import *
+
+# the dictionary is a bit limited
+addFilter("git.* spelling-error %description .* subpackages")
+addFilter("git-subtree.* spelling-error %description .* (subdirectory|subproject|subtree)")
+
+# 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-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|gnome-keyring)\..*: W: no-documentation")
+addFilter("perl-Git-SVN.noarch: W: no-documentation")
+addFilter("git-core\..*: W: no-manual-page-for-binary")
+
+# nothing provides git-gnome-keyring, it's simply obsolete
+addFilter("git.* obsolete-not-provided git-gnome-keyring")
diff --git a/git.spec b/git.spec
index afe4ec8..74aa45b 100644
--- a/git.spec
+++ b/git.spec
@@ -1099,9 +1099,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
-* Mon Jun 05 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.39.3-1
+* Thu Apr 27 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.39.3-1
 - Update to 2.39.3
-- Resolves: rhbz#2188374, rhbz#2188366
+- Resolves: #2188364, #2188373, #2190157, #2190158
 
 * Thu Jan 19 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 2.39.1-1
 - Update to 2.39.1