diff --git a/dev-util/git/git-1.7.1.bep b/dev-util/git/git-1.7.1.bep
new file mode 100644
index 000000000..0ac9da7b2
--- /dev/null
+++ b/dev-util/git/git-1.7.1.bep
@@ -0,0 +1,21 @@
+DESCRIPTION="git a fast version control system" 
+HOMEPAGE="http://git-scm.com/" 
+SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.1.tar.bz2"
+CHECKSUM_MD5="3da231dbe82ad103373cb530ae7475d5"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="net-misc/curl >= 7.20.0
+		dev-lang/perl >= 5.10.1"
+BUILD {
+	cd git-1.7.1
+	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.1
+	make install
+}
diff --git a/dev-util/git/patches/git-1.7.1.patch b/dev-util/git/patches/git-1.7.1.patch
new file mode 100644
index 000000000..5ef8295ad
--- /dev/null
+++ b/dev-util/git/patches/git-1.7.1.patch
@@ -0,0 +1,25 @@
+diff -up git-1.7.1/configure.ac.orig git-1.7.1/configure.ac
+--- git-1.7.1/configure.ac.orig	2010-04-23 20:38:35.035127296 -0600
++++ git-1.7.1/configure.ac	2010-05-13 18:03:30.180355072 -0600
+@@ -547,17 +547,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])
diff --git a/dev-util/mercurial/mercurial-1.5.3.bep b/dev-util/mercurial/mercurial-1.5.3.bep
new file mode 100644
index 000000000..9f62b8649
--- /dev/null
+++ b/dev-util/mercurial/mercurial-1.5.3.bep
@@ -0,0 +1,20 @@
+DESCRIPTION="Mercurial is a free, distributed source control management tool" 
+HOMEPAGE="http://mercurial.selenic.com/" 
+SRC_URI="http://mercurial.selenic.com/release/mercurial-1.5.3.tar.gz"
+CHECKSUM_MD5="0969b8109f1b5a9c4debf985cca938f9"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-lang/python >= 2.3"
+BUILD {
+	cd mercurial-1.5.3
+	python setup.py build --force
+}
+
+INSTALL {
+	cd mercurial-1.5.3
+	if [ -n ${DESTDIR} ];then
+		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force
+	else
+		python setup.py install --prefix="/boot/common" --force
+	fi
+}
diff --git a/dev-util/mercurial/patches/mercurial-1.5.3.patch b/dev-util/mercurial/patches/mercurial-1.5.3.patch
new file mode 100644
index 000000000..9aae6cec9
--- /dev/null
+++ b/dev-util/mercurial/patches/mercurial-1.5.3.patch
@@ -0,0 +1,12 @@
+diff -up mercurial-1.5.3/mercurial/ui.py.orig mercurial-1.5.3/mercurial/ui.py
+--- mercurial-1.5.3/mercurial/ui.py.orig	2010-05-13 10:30:46.037224448 -0600
++++ mercurial-1.5.3/mercurial/ui.py	2010-05-13 17:58:50.218890240 -0600
+@@ -384,7 +384,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
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.bep b/media-libs/sdl-sound/sdl-sound-1.0.3.bep
index c1361a586..b59e3c5c1 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3.bep
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3.bep
@@ -1,14 +1,11 @@
 DESCRIPTION="sdl-sound" 
 HOMEPAGE="http://www.icculus.org/SDL_sound" 
-# We're using mercurial, so need to fake out the download for now
-SRC_URI="http://www.haiku-ports.de/packages/sources/expat-2.0.1.tar.gz"
+SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound#release-1.0.3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="media-libs/libogg >= 1.1.4"
 BUILD {
-	rm -r SDL_sound
-	hg clone http://hg.icculus.org/icculus/SDL_sound
-	cd SDL_sound
+	cd sdl-sound-1.0.3
 	libtoolize --copy --force --install
 	./bootstrap
 	./configure --prefix=/boot/common
@@ -16,6 +13,6 @@ BUILD {
 }
 
 INSTALL {
-	cd SDL_sound
+	cd sdl-sound-1.0.3
 	make install
 }