diff --git a/Tools/git/build b/Tools/git/build
index 41b3341..9a8f435 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -14,8 +14,9 @@ pbuild::post_configure_Linux() {
 }
 
 pbuild::pre_configure() {
-	pbuild::add_configure_args "LIBS=-lintl"
+	#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"
 }
 
@@ -24,9 +25,9 @@ pbuild::post_compile() {
 }
 
 pbuild::post_install() {
-        make install-doc
+        make install-doc V=1 XMLTO_EXTRA='--skip-validation'
 	make -C contrib/subtree prefix="${PREFIX}" install
-	make -C contrib/subtree prefix="${PREFIX}" install-doc
+	make -C contrib/subtree prefix="${PREFIX}" install-doc XMLTO="xmlto --skip-validation"
 }
 
 # Local Variables:
diff --git a/Tools/git/files/variants b/Tools/git/files/variants
deleted file mode 100644
index 1639391..0000000
--- a/Tools/git/files/variants
+++ /dev/null
@@ -1,8 +0,0 @@
-git/2.3.3	stable		Tcl/8.6.4 Tk/8.6.4
-git/2.5.2	stable		Tcl/8.6.4 Tk/8.6.4
-git/2.8.1	stable		Tcl/8.6.4 Tk/8.6.4
-git/2.11.1	stable		Tcl/8.6.4 Tk/8.6.4
-git/2.13.0	stable		Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto
-git/2.16.2	stable		Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto
-git/2.19.1	unstable	Tcl/8.6.4 Tk/8.6.4 b:perl/5.26.1 b:asciidoc/8.6.9 b:xmlto/0.0.28
-git/2.21.0	unstable	Tcl/8.6.9 Tk/8.6.9 b:perl/5.28.1 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
diff --git a/Tools/git/files/variants.macos10.14 b/Tools/git/files/variants.macos10.14
new file mode 100644
index 0000000..820a564
--- /dev/null
+++ b/Tools/git/files/variants.macos10.14
@@ -0,0 +1,2 @@
+git/2.21.0	stable		b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1
+git/2.23.0	stable		b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1
diff --git a/Tools/git/files/variants.rhel6 b/Tools/git/files/variants.rhel6
new file mode 100644
index 0000000..d2fa03b
--- /dev/null
+++ b/Tools/git/files/variants.rhel6
@@ -0,0 +1,4 @@
+git/2.3.3	stable		Tcl/8.6.4 Tk/8.6.4
+git/2.8.1	stable		Tcl/8.6.4 Tk/8.6.4
+git/2.21.0	stable		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	stable		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