diff --git a/dev-vcs/mercurial/mercurial-3.2.1.recipe b/dev-vcs/mercurial/mercurial-3.2.1.recipe
new file mode 100644
index 000000000..6cad0b92c
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-3.2.1.recipe
@@ -0,0 +1,56 @@
+SUMMARY="Free, distributed source control management tool"
+DESCRIPTION="
+Mercurial is a free, distributed source control management tool.
+"
+HOMEPAGE="http://mercurial.selenic.com/"
+COPYRIGHT="2005-2014 Matt Mackall et al."
+LICENSE="GNU GPL v2"
+SRC_URI="http://mercurial.selenic.com/release/mercurial-$portVersion.tar.gz"
+CHECKSUM_SHA256="26418276fbc36850782f1f4feb30da4a83800b48493082985c4d3ac29ad0ca0f"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="mercurial-3.2.1.patch"
+
+PROVIDES="
+	mercurial = $portVersion compat >= 3
+	cmd:hg = $portVersion compat >= 3
+	"
+
+REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:python
+	cmd:nano
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc
+	cmd:gettext
+	cmd:ld
+	cmd:make
+	cmd:msgfmt
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
+}
+
+INSTALL()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py install \
+		--prefix="$prefix" \
+		--install-headers="$includedir" \
+		--force
+}
+
+TEST()
+{
+	cd tests
+	python run-tests.py
+}
diff --git a/dev-vcs/mercurial/patches/mercurial-3.2.1.patch b/dev-vcs/mercurial/patches/mercurial-3.2.1.patch
new file mode 100644
index 000000000..4ca47d318
--- /dev/null
+++ b/dev-vcs/mercurial/patches/mercurial-3.2.1.patch
@@ -0,0 +1,12 @@
+diff -up mercurial-3.2.1/mercurial/ui.py.orig mercurial-3.2/mercurial/ui.py
+--- mercurial-3.2.1/mercurial/ui.py.orig	2012-06-01 22:48:21.025690112 -0600
++++ mercurial-3.2.1/mercurial/ui.py	2012-06-04 17:15:16.317980672 -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