diff --git a/dev-vcs/mercurial/mercurial-2.2.1.bep b/dev-vcs/mercurial/mercurial-2.2.1.bep
new file mode 100644
index 000000000..9fd172530
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.2.1.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-2.2.1.tar.gz"
+CHECKSUM_MD5="0ff7c7f7c50e506d494ff84baa10a77d"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-lang/python >= 2.3"
+BUILD {
+	cd mercurial-2.2.1
+	python setup.py build --force
+}
+
+INSTALL {
+	cd mercurial-2.2.1
+	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-2.2.1/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-2012 Matt Mackall et al."
diff --git a/dev-vcs/mercurial/patches/mercurial-2.2.1.patch b/dev-vcs/mercurial/patches/mercurial-2.2.1.patch
new file mode 100644
index 000000000..558651c5d
--- /dev/null
+++ b/dev-vcs/mercurial/patches/mercurial-2.2.1.patch
@@ -0,0 +1,12 @@
+diff -up mercurial-2.2.1/mercurial/ui.py.orig mercurial-2.2.1/mercurial/ui.py
+--- mercurial-2.2.1/mercurial/ui.py.orig	2012-05-03 15:06:29.013369344 -0600
++++ mercurial-2.2.1/mercurial/ui.py	2012-05-03 20:21:26.126091264 -0600
+@@ -693,7 +693,7 @@ class ui(object):
+             # avoid confusion.
+             editor = 'E'
+         else:
+-            editor = 'vi'
++            editor = 'nano'
+         return (os.environ.get("HGEDITOR") or
+                 self.config("ui", "editor") or
+                 os.environ.get("VISUAL") or