diff --git a/dev-util/git/git-1.7.0.4.bep b/dev-util/git/git-1.7.0.4.bep
new file mode 100644
index 000000000..640f2f8ec
--- /dev/null
+++ b/dev-util/git/git-1.7.0.4.bep
@@ -0,0 +1,20 @@
+DESCRIPTION="git a fast version control system" 
+HOMEPAGE="http://git-scm.com/" 
+SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.0.4.tar.bz2"
+CHECKSUM_MD5="1cc8b2aea57e5e999ccac18ae355f760"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd git-1.7.0.4
+	autoconf
+	CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \
+	./configure --prefix=/boot/common --with-editor=nano --enable-pthreads="-lroot" \
+	--with-perl=/boot/common/bin/perl --with-python=/boot/common/bin/python --without-tcltk
+	make strip
+}
+
+INSTALL {
+	cd git-1.7.0.4
+	make install
+}
diff --git a/dev-util/git/git.OptionalPackageDescription b/dev-util/git/git.OptionalPackageDescription
index 55ebfbccd..1d71e4736 100644
--- a/dev-util/git/git.OptionalPackageDescription
+++ b/dev-util/git/git.OptionalPackageDescription
@@ -1,5 +1,5 @@
 Package:	git
-Version:	1.7.0.1
+Version:	1.7.0.4
 Copyright:	 
 License:	GNU GPL v2
 URL:		http://www.git-scm.com/
diff --git a/dev-util/git/patches/git-1.7.0.4.patch b/dev-util/git/patches/git-1.7.0.4.patch
new file mode 100644
index 000000000..68e66a2d4
--- /dev/null
+++ b/dev-util/git/patches/git-1.7.0.4.patch
@@ -0,0 +1,25 @@
+diff -up git-1.7.0.4/configure.ac.orig git-1.7.0.4/configure.ac
+--- git-1.7.0.4/configure.ac.orig	2010-04-03 18:57:28.303824896 -0600
++++ git-1.7.0.4/configure.ac	2010-04-03 18:59:05.954990592 -0600
+@@ -527,17 +527,13 @@ test -n "$NEEDS_SOCKET" && LIBS="$LIBS -
+ # Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough.
+ # Notably on Solaris hstrerror resides in libresolv and on Solaris 7
+ # inet_ntop and inet_pton additionally reside there.
+-AC_CHECK_LIB([c], [hstrerror],
+-[NEEDS_RESOLV=],
+-[NEEDS_RESOLV=YesPlease])
++AC_SEARCH_LIBS([hstrerror], [resolv],
++[AC_DEFINE([NEEDS_RESOLV], [YesPlease])])
+ AC_SUBST(NEEDS_RESOLV)
+-test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv"
+ 
+-AC_CHECK_LIB([c], [basename],
+-[NEEDS_LIBGEN=],
+-[NEEDS_LIBGEN=YesPlease])
++AC_SEARCH_LIBS([basename], [gen],
++[AC_DEFINE([NEEDS_LIBGEN], [YesPlease])])
+ AC_SUBST(NEEDS_LIBGEN)
+-test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen"
+ 
+ ## Checks for header files.
+ AC_MSG_NOTICE([CHECKS for header files])