diff --git a/devel/git/Makefile b/devel/git/Makefile
index c0c2d40259b..9797fcb9df7 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2008/02/19 09:05:58 bernd Exp $
+# $OpenBSD: Makefile,v 1.21 2008/03/28 19:06:20 bernd Exp $
 
 COMMENT-main=		GIT - Tree History Storage Tool
 COMMENT-svn=		GIT - subversion interoperability tools
 
 V=			1.5.4.2
 DISTNAME=		git-${V}
-PKGNAME-main=		${DISTNAME}
+PKGNAME-main=		${DISTNAME}p0
 PKGNAME-svn=		git-svn-${V}
 CATEGORIES=		devel
 
diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile
index e8f189c6cf5..1bea81cbf3f 100644
--- a/devel/git/patches/patch-Makefile
+++ b/devel/git/patches/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri Feb  1 23:09:01 2008
-+++ Makefile	Sat Feb  2 19:32:17 2008
-@@ -150,13 +150,13 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo
+--- Makefile.orig	Sun Feb 17 09:53:46 2008
++++ Makefile	Wed Mar 26 23:03:15 2008
+@@ -150,15 +150,15 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -14,8 +14,11 @@
 -prefix = $(HOME)
 +#prefix = $(HOME)
  bindir = $(prefix)/bin
- mandir = $(prefix)/share/man
+-mandir = $(prefix)/share/man
++mandir = $(prefix)/man
  infodir = $(prefix)/share/info
+ gitexecdir = $(bindir)
+ sharedir = $(prefix)/share
 @@ -170,7 +170,7 @@ else
  sysconfdir = $(prefix)/etc
  endif