diff --git a/dev-util/mercurial/mercurial-1.5.2.bep b/dev-util/mercurial/mercurial-1.5.2.bep
new file mode 100644
index 000000000..c909701f1
--- /dev/null
+++ b/dev-util/mercurial/mercurial-1.5.2.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.2.tar.gz"
+CHECKSUM_MD5="deafaaf017fc3c8a9deef39e566aec80"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd mercurial-1.5.2
+	python setup.py build --force
+}
+
+INSTALL {
+	cd mercurial-1.5.2
+	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/mercurial.OptionalPackageDescription b/dev-util/mercurial/mercurial.OptionalPackageDescription
index f4a77598e..03380ef80 100644
--- a/dev-util/mercurial/mercurial.OptionalPackageDescription
+++ b/dev-util/mercurial/mercurial.OptionalPackageDescription
@@ -1,5 +1,5 @@
 Package:	Mercurial
-Version:	1.5.1
+Version:	1.5.2
 Copyright:	2005-2010 Matt Mackall et al. 
 License:	GNU GPL v2
 URL:		http://mercurial.selenic.com
diff --git a/dev-util/mercurial/patches/mercurial-1.5.2.patch b/dev-util/mercurial/patches/mercurial-1.5.2.patch
new file mode 100644
index 000000000..2f8db7ab5
--- /dev/null
+++ b/dev-util/mercurial/patches/mercurial-1.5.2.patch
@@ -0,0 +1,12 @@
+diff -up mercurial-1.5.2/mercurial/ui.py.orig mercurial-1.5.2/mercurial/ui.py
+--- mercurial-1.5.2/mercurial/ui.py.orig	2010-05-01 15:02:48.041156608 -0600
++++ mercurial-1.5.2/mercurial/ui.py	2010-05-01 17:04:56.068943872 -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