diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index a5455fb9864..2c6013723a7 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.28.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
@@ -51,19 +51,18 @@ post_install() {
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git
-	make -C contrib/contacts DESTDIR=${DESTDIR} prefix=/usr install install-man
+	make -C contrib/contacts DESTDIR=${DESTDIR} install install-man
 	vbin contrib/diff-highlight/diff-highlight
-	vinstall contrib/diff-highlight/README 644 usr/share/doc/git-diff-highlight
+	vdoc contrib/diff-highlight/README diff-highlight
 	vinstall contrib/git-jump/git-jump 755 usr/libexec/git-core
-	vinstall contrib/git-jump/README 644 usr/share/doc/git-jump
-	make -C contrib/subtree DESTDIR=${DESTDIR} prefix=/usr install install-man
+	vdoc contrib/git-jump/README git-jump
+	make -C contrib/subtree DESTDIR=${DESTDIR} install install-man
 	vinstall contrib/credential/libsecret/git-credential-libsecret 755 \
 		usr/libexec/git-core
 	make -C contrib/credential/netrc DESTDIR=${DESTDIR} install
 }
 
 git-cvs_package() {
-	archs=noarch
 	depends="${sourcepkg}-${version}_${revision} cvs cvsps2 perl-DBD-SQLite"
 	short_desc+=" - CVS support"
 	pkg_install() {
@@ -74,6 +73,7 @@ git-cvs_package() {
 		vmove usr/share/man/man1/git-cvsexportcommit.1
 		vmove usr/share/man/man1/git-cvsimport.1
 		vmove usr/share/man/man1/git-cvsserver.1
+		vmove usr/share/man/man7/gitcvs-migration.7
 	}
 }
 
@@ -89,7 +89,6 @@ git-svn_package() {
 }
 
 gitk_package() {
-	archs=noarch
 	depends="git-${version}_${revision} tk"
 	short_desc="Git repository browser"
 	license="GPL-2.0-or-later"
@@ -101,7 +100,6 @@ gitk_package() {
 }
 
 git-gui_package() {
-	archs=noarch
 	depends="git-${version}_${revision} tk"
 	short_desc+=" - GUI tool"
 	license="GPL-2.0-or-later"
@@ -110,13 +108,13 @@ git-gui_package() {
 		vmove usr/libexec/git-core/git-gui
 		vmove usr/libexec/git-core/git-citool
 		vmove usr/share/man/man1/git-gui.1
+		vmove usr/share/man/man1/git-citool.1
 		vmove usr/share/git-gui
 	}
 }
 
 git-all_package() {
 	build_style=meta
-	archs=noarch
 	depends="${subpackages/git-all/}"
 	short_desc+=" - meta-package for complete Git installation"
 }
@@ -132,7 +130,6 @@ git-libsecret_package() {
 
 git-netrc_package() {
 	depends="git-${version}_${revision}"
-	archs=noarch
 	short_desc+=" - netrc credential helper"
 	pkg_install() {
 		vmove usr/libexec/git-core/git-credential-netrc