diff --git a/dev-util/mercurial/mercurial-1.6.bep b/dev-util/mercurial/mercurial-1.6.bep
new file mode 100644
index 000000000..2e993e784
--- /dev/null
+++ b/dev-util/mercurial/mercurial-1.6.bep
@@ -0,0 +1,22 @@
+DESCRIPTION="Mercurial is a free, distributed source control management tool" 
+HOMEPAGE="http://mercurial.selenic.com/" 
+SRC_URI="http://mercurial.selenic.com/release/mercurial-1.6.tar.gz"
+CHECKSUM_MD5="e97772cb424d29d9382c41daafa6f92d"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-lang/python >= 2.3"
+BUILD {
+	cd mercurial-1.6
+	python setup.py build --force
+}
+
+INSTALL {
+	cd mercurial-1.6
+	if [ -n "${DESTDIR}" ];then
+		python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force
+	else
+		python setup.py install --prefix="/boot/common" --force
+	fi
+}
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2010 Matt Mackall et al. "
diff --git a/dev-util/mercurial/patches/mercurial-1.6.patch b/dev-util/mercurial/patches/mercurial-1.6.patch
new file mode 100644
index 000000000..570190c90
--- /dev/null
+++ b/dev-util/mercurial/patches/mercurial-1.6.patch
@@ -0,0 +1,12 @@
+diff -up mercurial-1.6/mercurial/ui.py.orig mercurial-1.6/mercurial/ui.py
+--- mercurial-1.6/mercurial/ui.py.orig	2010-07-01 11:06:27.030670848 -0600
++++ mercurial-1.6/mercurial/ui.py	2010-07-01 11:41:21.504365056 -0600
+@@ -557,7 +557,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