diff --git a/devel/git/Makefile b/devel/git/Makefile
index 2eecad04b8b..8309f9a165a 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.138 2015/09/18 06:47:02 benoit Exp $
+# $OpenBSD: Makefile,v 1.139 2015/09/29 11:42:59 benoit Exp $
 
 COMMENT-main =	GIT - Tree History Storage Tool
 COMMENT-svn =	GIT - subversion interoperability tools
 COMMENT-x11 =	GIT - graphical tools
 
-V =		2.5.3
+V =		2.6.0
 DISTNAME =	git-${V}
 PKGNAME-main =	${DISTNAME}
 PKGNAME-svn =	git-svn-${V}
diff --git a/devel/git/distinfo b/devel/git/distinfo
index aaf0b87954e..175cc9bee63 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,4 +1,4 @@
-SHA256 (git-2.5.3.tar.gz) = 6/P7Dz8obV8ZPv7KiONMQKPLU8mFofU94NvwjD5a+Xk=
-SHA256 (git-manpages-2.5.3.tar.gz) = pSmoCshd0CO98JBy2kp+qDMcWsGufhbjQSyfuDGCAsM=
-SIZE (git-2.5.3.tar.gz) = 5430330
-SIZE (git-manpages-2.5.3.tar.gz) = 601623
+SHA256 (git-2.6.0.tar.gz) = P/3ZBy3BbYHzaYj2+gDHzzt61Q3su/ij5131S4vJZ6Y=
+SHA256 (git-manpages-2.6.0.tar.gz) = g76wacx+HF9eKGXeTETup4+0YoZmHW1/owoylcUU1MM=
+SIZE (git-2.6.0.tar.gz) = 5528220
+SIZE (git-manpages-2.6.0.tar.gz) = 607149
diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile
index dec3f3e488d..9b59ae4ce7e 100644
--- a/devel/git/patches/patch-Makefile
+++ b/devel/git/patches/patch-Makefile
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile,v 1.56 2015/08/25 21:25:03 benoit Exp $
+$OpenBSD: patch-Makefile,v 1.57 2015/09/29 11:42:59 benoit Exp $
 
 No need for librt on OpenBSD
 
 Workaround for ar(1) not having 's' on VAX by calling ranlib
 
---- Makefile.orig	Mon Jul 27 22:34:56 2015
-+++ Makefile	Tue Aug 25 23:06:57 2015
-@@ -1431,7 +1431,6 @@ endif
+--- Makefile.orig	Tue Sep 29 01:01:32 2015
++++ Makefile	Tue Sep 29 08:19:30 2015
+@@ -1435,7 +1435,6 @@ endif
  
  ifdef HAVE_CLOCK_GETTIME
  	BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
@@ -14,7 +14,7 @@ Workaround for ar(1) not having 's' on VAX by calling ranlib
  endif
  
  ifdef HAVE_CLOCK_MONOTONIC
-@@ -1991,13 +1990,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
+@@ -1995,13 +1994,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
  $(LIB_FILE): $(LIB_OBJS)
@@ -31,7 +31,7 @@ Workaround for ar(1) not having 's' on VAX by calling ranlib
  
  export DEFAULT_EDITOR DEFAULT_PAGER
  
-@@ -2180,7 +2179,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2184,7 +2183,7 @@ export TEST_NO_MALLOC_CHECK
  
  ### Testing rules
  
diff --git a/devel/git/pkg/PLIST-main b/devel/git/pkg/PLIST-main
index 2e96146cb37..90d430d980f 100644
--- a/devel/git/pkg/PLIST-main
+++ b/devel/git/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.64 2015/08/25 21:25:03 benoit Exp $
+@comment $OpenBSD: PLIST-main,v 1.65 2015/09/29 11:42:59 benoit Exp $
 @pkgpath devel/git
 @bin bin/git
 bin/git-cvsserver
@@ -16,7 +16,7 @@ libexec/git/
 @bin libexec/git/git
 @bin libexec/git/git-add
 libexec/git/git-add--interactive
-libexec/git/git-am
+@bin libexec/git/git-am
 @bin libexec/git/git-annotate
 @bin libexec/git/git-apply
 libexec/git/git-archimport
@@ -113,7 +113,7 @@ libexec/git/git-parse-remote
 @bin libexec/git/git-patch-id
 @bin libexec/git/git-prune
 @bin libexec/git/git-prune-packed
-libexec/git/git-pull
+@bin libexec/git/git-pull
 @bin libexec/git/git-push
 libexec/git/git-quiltimport
 @bin libexec/git/git-read-tree