diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe
index fc13e661d..3d3bbf397 100644
--- a/dev-vcs/mercurial/mercurial-2.2.2.recipe
+++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe
@@ -1,33 +1,57 @@
-DESCRIPTION="Mercurial is a free, distributed source control management tool" 
+SUMMARY="Free, distributed source control management tool"
+DESCRIPTION="Mercurial is a free, distributed source control management tool."
 HOMEPAGE="http://mercurial.selenic.com/" 
+COPYRIGHT="2005-2012 Matt Mackall et al."
+LICENSE="GNU GPL v2"
 SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz"
 CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lang/python >= 2.3"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="mercurial-2.2.2.patch"
+
+PROVIDES="
+	mercurial = $portVersion compat >= 2
+	cmd:hg = $portVersion compat >= 2
+	"
+REQUIRES="
+	haiku_devel >= $haikuVersion
+	python
+	cmd:nano
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	gettext
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
+
 BUILD()
 {
-	cd mercurial-2.2.2
 	python setup.py build --force
 }
 
 INSTALL()
 {
-	cd mercurial-2.2.2
-	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
+	python setup.py install \
+		--prefix="$prefix" \
+		--install-headers="$includedir" \
+		--force
 }
 
 shopt -s extglob
 TEST()
 {
-	cd mercurial-2.2.2/tests
+	cd tests
 	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
 	python run-tests.py
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2012 Matt Mackall et al."