diff --git a/Tools/git/build b/Tools/git/build
index 1c63eaf..16961b7 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -1,6 +1,9 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "http://www.kernel.org/pub/software/scm/$P/$P-${V_PKG}.tar.gz"
+pbuild::set_download_url \
+	"http://www.kernel.org/pub/software/scm/$P/$P-${V_PKG}.tar.gz"
+pbuild::add_to_group 'Tools'
+
 pbuild::compile_in_sourcetree
 pbuild::install_docfiles 'COPYING' 'README.md'
 
@@ -8,15 +11,13 @@ pbuild::pre_configure_Darwin() {
 	export NO_APPLE_COMMON_CRYPTO=1
 }
 
-pbuild::post_configure_Linux() {
-	echo 'LIBC_CONTAINS_LIBINTL=' >> "${SRC_DIR}/config.mak.autogen"
-}
 
 pbuild::pre_configure() {
 	#pbuild::add_configure_args "LIBS=-lintl"
 	pbuild::add_configure_args "--with-tcltk"
 	pbuild::add_configure_args "--with-iconv=${GETTEXT_PREFIX}"
 	pbuild::add_configure_args "--with-perl=${PERL_PREFIX}/bin/perl"
+	:
 }
 
 pbuild::post_compile() {
diff --git a/Tools/git/files/config.yaml b/Tools/git/files/config.yaml
new file mode 100644
index 0000000..e046f99
--- /dev/null
+++ b/Tools/git/files/config.yaml
@@ -0,0 +1,36 @@
+overlay: base
+relstage: stable
+group: Tools
+shasums:
+  git/2.37.0: fc3ffe6c65c1f7c681a1ce6bb91703866e432c762731d4b57c566d696f6d62c3
+  git/2.33.1: 02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d
+  git/2.30.0: d24c4fa2a658318c2e66e25ab67cc30038a35696d2d39e6b12ceccf024de1e5e
+  git/2.22.0: a4b7e4365bee43caa12a38d646d2c93743d755d1cea5eab448ffb40906c9da0b
+  git/2.21.0: 85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee
+  git/2.8.1: e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc
+  git/2.3.3: c189e4a48d8805482f450db666330c79bcefae37e0d035c7717517126ddf4305
+
+git/2.37.2:
+ - dependencies: TclTk/8.6.9
+   build_requires: go/1.19 perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
+   overlay: devel
+   relstage: unstable
+git/2.37.0:
+ - dependencies: TclTk/8.6.9
+   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
+git/2.33.1:
+ - dependencies: TclTk/8.6.9
+   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
+git/2.30.0:
+ - dependencies: TclTk/8.6.9
+   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
+git/2.22.0:
+ - dependencies: TclTk/8.6.9
+   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
+git/2.21.0:
+ - dependencies: TclTk/8.6.9
+   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
+git/2.8.1:
+ - dependencies: Tcl/8.6.4 Tk/8.6.4
+git/2.3.3:
+ - dependencies: Tcl/8.6.4 Tk/8.6.4
diff --git a/Tools/git/files/variants.rhel6 b/Tools/git/files/variants.rhel6
new file mode 100644
index 0000000..d4c43d4
--- /dev/null
+++ b/Tools/git/files/variants.rhel6
@@ -0,0 +1,9 @@
+git/2.3.3  stable
+git/2.8.1  stable
+git/2.21.0 stable
+git/2.22.0 stable
+git/2.30.0 stable
+git/2.33.1 stable
+git/2.37.0 stable
+git/2.37.2 stable git-lfs/3.3.0
+git/2.39.1 stable git-lfs/3.3.0
diff --git a/Tools/git/files/variants.yaml b/Tools/git/files/variants.yaml
deleted file mode 100644
index 44de42f..0000000
--- a/Tools/git/files/variants.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-overlay: base
-relstage: stable
-group: Tools
-
-git/2.3.3:
- - dependencies: Tcl/8.6.4 Tk/8.6.4
-git/2.8.1:
- - dependencies: Tcl/8.6.4 Tk/8.6.4
-git/2.21.0:
- - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
-git/2.22.0:
- - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
-git/2.30.0:
- - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
-git/2.33.1:
- - dependencies: TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
-git/2.37.0:
- - dependencies: TclTk/8.6.9
-   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8