diff --git a/dev-vcs/git/git-1.7.6.bep b/dev-vcs/git/git-1.7.6.bep
new file mode 100644
index 000000000..523d6bd96
--- /dev/null
+++ b/dev-vcs/git/git-1.7.6.bep
@@ -0,0 +1,25 @@
+DESCRIPTION="git a fast version control system" 
+HOMEPAGE="http://git-scm.com/" 
+SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.6.tar.bz2"
+CHECKSUM_MD5="9e0a438eb71e89eedb61f89470ed32a0"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="net-misc/curl >= 7.20.0
+		dev-lang/perl >= 5.10.1"
+BUILD {
+	cd git-1.7.6
+	make strip
+}
+
+INSTALL {
+	cd git-1.7.6
+	make install
+}
+
+TEST {
+	cd git-1.7.6
+	make check
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2011 Git Authors (see git web site for list)"
diff --git a/dev-vcs/git/patches/git-1.7.6.patch b/dev-vcs/git/patches/git-1.7.6.patch
new file mode 100644
index 000000000..fa7149819
--- /dev/null
+++ b/dev-vcs/git/patches/git-1.7.6.patch
@@ -0,0 +1,55 @@
+diff -up git-1.7.6/Makefile.orig git-1.7.6/Makefile
+--- git-1.7.6/Makefile.orig	2011-06-26 16:26:13.012582912 -0600
++++ git-1.7.6/Makefile	2011-07-02 12:04:18.592183296 -0600
+@@ -1142,6 +1142,30 @@ ifeq ($(uname_S),Interix)
+ 		NO_INET_PTON = YesPlease
+ 	endif
+ endif
++ifeq ($(uname_S),Haiku)
++	NO_LIBGEN_H = YesPlease
++	NO_MEMMEM = YesPlease
++	NO_MKSTEMPS = YesPlease
++	NEEDS_LIBICONV = YesPlease
++	NO_IPV6 = YesPlease
++	PERL_PATH = perl
++	PYTHON_PATH = python
++#	TCL_PATH = tclsh
++	mandir = /boot/common/documentation/man
++	infodir = /boot/common/documentation/info
++	gitexecdir = /boot/common/bin/git-core
++	gitwebdir = /boot/common/data/gitweb
++	template_dir = /boot/common/data/git-core/templates
++	NO_TCLTK = YesPlease
++	DEFAULT_EDITOR = nano
++	CURL_DIR = /boot/common
++	EXPAT_DIR = /boot/common
++	BASIC_CFLAGS += -I/boot/common/include
++	BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib
++	PTHREAD_LIBS =
++	prefix = /boot/common
++	NO_CROSS_DIRECTORY_HARDLINKS = YesPlease
++endif
+ ifneq (,$(findstring MINGW,$(uname_S)))
+ 	pathsep = ;
+ 	NO_PREAD = YesPlease
+diff -up git-1.7.6/git-gui/Makefile.orig git-1.7.6/git-gui/Makefile
+--- git-1.7.6/git-gui/Makefile.orig	2011-06-26 16:26:13.052690944 -0600
++++ git-1.7.6/git-gui/Makefile	2011-07-02 12:04:18.594804736 -0600
+@@ -57,7 +57,7 @@ INSTALL_X1 =
+ INSTALL_A0 = find # space is required here
+ INSTALL_A1 = | cpio -pud
+ INSTALL_L0 = rm -f # space is required here
+-INSTALL_L1 = && ln # space is required here
++INSTALL_L1 = && ln -s # space is required here
+ INSTALL_L2 =
+ INSTALL_L3 =
+ 
+@@ -87,7 +87,7 @@ ifndef V
+ 	INSTALL_L0 = dst=
+ 	INSTALL_L1 = && src=
+ 	INSTALL_L2 = && dst=
+-	INSTALL_L3 = && echo '   ' 'LINK       ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
++	INSTALL_L3 = && echo '   ' 'LINK       ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln -s "$$src" "$$dst"
+ 
+ 	CLEAN_DST = echo ' ' UNINSTALL
+ 	REMOVE_D0 = dir=
diff --git a/dev-vcs/mercurial/mercurial-1.9.bep b/dev-vcs/mercurial/mercurial-1.9.bep
new file mode 100644
index 000000000..7d1cc60e8
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-1.9.bep
@@ -0,0 +1,30 @@
+DESCRIPTION="Mercurial is a free, distributed source control management tool" 
+HOMEPAGE="http://mercurial.selenic.com/" 
+SRC_URI="http://mercurial.selenic.com/release/mercurial-1.9.tar.gz"
+CHECKSUM_MD5="d4842129fa2732eb6ed1180467bc32e2"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-lang/python >= 2.3"
+BUILD {
+	cd mercurial-1.9
+	python setup.py build --force
+}
+
+INSTALL {
+	cd mercurial-1.9
+	if [ -n "${DESTDIR}" ];then
+		python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
+	else
+		python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force
+	fi
+}
+
+TEST {
+	cd mercurial-1.9/tests
+	shopt -s extglob
+	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
+	python run-tests.py
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2011 Matt Mackall et al."
diff --git a/dev-vcs/mercurial/patches/mercurial-1.9.patch b/dev-vcs/mercurial/patches/mercurial-1.9.patch
new file mode 100644
index 000000000..237f9be61
--- /dev/null
+++ b/dev-vcs/mercurial/patches/mercurial-1.9.patch
@@ -0,0 +1,12 @@
+diff -up mercurial-1.9/mercurial/ui.py.orig mercurial-1.9/mercurial/ui.py
+--- mercurial-1.9/mercurial/ui.py.orig	2011-07-01 12:54:23.057933824 -0600
++++ mercurial-1.9/mercurial/ui.py	2011-07-02 12:23:10.208666624 -0600
+@@ -656,7 +656,7 @@ class ui(object):
+         return (os.environ.get("HGEDITOR") or
+                 self.config("ui", "editor") or
+                 os.environ.get("VISUAL") or
+-                os.environ.get("EDITOR", "vi"))
++                os.environ.get("EDITOR", "nano"))
+ 
+     def progress(self, topic, pos, item="", unit="", total=None):
+         '''show a progress message