diff --git a/Tools/git/build b/Tools/git/build
index 6740be6..d94b4e7 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -1,43 +1,29 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://www.kernel.org/pub/software/scm/$P/$P-$V.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'
 
-case ${OS} in
-Darwin )
+pbuild::pre_configure_Darwin() {
 	export NO_APPLE_COMMON_CRYPTO=1
-	# we use 'asciidoc' from MacPorts
-	PATH+=':/opt/local/bin'
-	;;
-esac
-
-pbuild::configure() {
-	cd "${SRC_DIR}"
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		--with-tcltk \
-		--with-perl="${PERL_PREFIX}/bin/perl" \
-		|| exit 1
 }
 
-pbuild::compile() {
-        cd "${SRC_DIR}"
-        make
+pbuild::pre_configure() {
+	pbuild::add_configure_args "--with-tcltk"
+	pbuild::add_configure_args "--with-perl=${PERL_PREFIX}/bin/perl"
+}
 
+pbuild::post_compile() {
 	make -C contrib/subtree prefix="${prefix}"
 }
 
-pbuild::install() {
-        cd "${SRC_DIR}"
-        make install
+pbuild::post_install() {
         make install-doc
 	make -C contrib/subtree prefix="${PREFIX}" install
 	make -C contrib/subtree prefix="${PREFIX}" install-doc
 }
 
-pbuild::add_to_group 'Tools'
-pbuild::install_docfiles 'COPYING' 'README.md'
-pbuild::make_all
-
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8
diff --git a/Tools/git/files/variants b/Tools/git/files/variants
index 59357c2..cd4f7ce 100644
--- a/Tools/git/files/variants
+++ b/Tools/git/files/variants
@@ -4,3 +4,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