diff --git a/git/build.sh b/git/build.sh
index 91ff80f..f46097f 100755
--- a/git/build.sh
+++ b/git/build.sh
@@ -6,18 +6,28 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=git
-version=2.11.3
+version=2.14.2
 pkgver=1
 source[0]=https://www.kernel.org/pub/software/scm/git/$topdir-$version.tar.gz
 source[1]=https://www.kernel.org/pub/software/scm/git/$topdir-manpages-$version.tar.gz
 # If there are no patches, simply comment this
 patch[0]=git-1.8.1.5-inet_addrstrlen.patch
 patch[1]=git-2.11.0-stdint_h.patch
+patch[2]=git-2.14.1-fix-t5545.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
 # Global settings
+# hangs indefinitely
+GIT_SKIP_TESTS="t9010"
+# TZ=UTC returns GMT instead of UTC
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t0006.25"
+# fails to distinguish file vs. dir
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t1308.23"
+# cat-file --textconv is buggy, output is truncated
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t8010.8"
+export GIT_SKIP_TESTS
 no_configure=1
 __configure="make"
 configure_args=
diff --git a/git/meta/ChangeLog b/git/meta/ChangeLog
index d134c56..69b1929 100644
--- a/git/meta/ChangeLog
+++ b/git/meta/ChangeLog
@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Thu Sep 28 2017 Tom G. Christensen <swpkg@jupiterrise.com> - 2.14.2-1
+- Update to 2.14.2
+
 * Sat Aug 19 2017 Tom G. Christensen <swpkg@jupiterrise.com> - 2.11.3-1
 - Update to 2.11.3 (fixes CVE-2017-1000117)
 
diff --git a/git/src/git-2.14.1-fix-t5545.patch b/git/src/git-2.14.1-fix-t5545.patch
new file mode 100644
index 0000000..b0a365a
--- /dev/null
+++ b/git/src/git-2.14.1-fix-t5545.patch
@@ -0,0 +1,26 @@
+--- git-2.14.1/t/t5545-push-options.sh.tfix	2017-08-09 21:54:31.000000000 +0200
++++ git-2.14.1/t/t5545-push-options.sh	2017-09-24 20:37:42.373751000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/ksh
+ 
+ test_description='pushing to a repository using push options'
+ 
+@@ -13,7 +13,7 @@
+ 		git config receive.denyCurrentBranch warn &&
+ 		mkdir -p .git/hooks &&
+ 		cat >.git/hooks/pre-receive <<-'EOF' &&
+-		#!/bin/sh
++		#!/bin/ksh
+ 		if test -n "$GIT_PUSH_OPTION_COUNT"; then
+ 			i=0
+ 			>hooks/pre-receive.push_options
+@@ -27,7 +27,7 @@
+ 		chmod u+x .git/hooks/pre-receive
+ 
+ 		cat >.git/hooks/post-receive <<-'EOF' &&
+-		#!/bin/sh
++		#!/bin/ksh
+ 		if test -n "$GIT_PUSH_OPTION_COUNT"; then
+ 			i=0
+ 			>hooks/post-receive.push_options