diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 589fcfa7763..2287f4c64fc 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/01 03:21:46 fgsch Exp $
+# $OpenBSD: Makefile,v 1.21 2009/11/20 15:09:24 benoit Exp $
 
 COMMENT =		fast, lightweight source control management
 
-MODPY_EGG_VERSION =	1.3.1
+MODPY_EGG_VERSION =	1.4
 DISTNAME =		mercurial-${MODPY_EGG_VERSION}
 CATEGORIES =     	devel
 HOMEPAGE =		http://www.selenic.com/mercurial/
@@ -30,7 +30,7 @@ CONTRIBFILES =		bash_completion mercurial.el sample.hgrc \
 CONTRIBDIRS =		git-viz hgsh vim
 SCRIPTS =		convert-repo hg-ssh hgdiff hgk \
 			tcsh_completion_build.sh dumprevlog \
-			undumprevlog hg-relink rewrite-log simplemerge
+			undumprevlog rewrite-log simplemerge
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index e1d7c0ad2ec..487c439ed97 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-MD5 (mercurial-1.3.1.tar.gz) = ZQTw3DK9fs9Zqff3GUMudg==
-RMD160 (mercurial-1.3.1.tar.gz) = HkPYaX5NJp/cBl7oLEjhzxMvbW8=
-SHA1 (mercurial-1.3.1.tar.gz) = qVN/q3x+rVAaZBTRkA9G4K4+SLg=
-SHA256 (mercurial-1.3.1.tar.gz) = /5KLVX9BN0l0Fx3xsDhOMxYa/5fF/hyFanuRvzsVSmI=
-SIZE (mercurial-1.3.1.tar.gz) = 1770585
+MD5 (mercurial-1.4.tar.gz) = lR69SoFT6qPFb8DOJXWrcA==
+RMD160 (mercurial-1.4.tar.gz) = L39Ot+toSkoGTLAjQ2HaFSSAW58=
+SHA1 (mercurial-1.4.tar.gz) = SrCgJ83Y38Vwd6nVmejq1VDU0RY=
+SHA256 (mercurial-1.4.tar.gz) = ByZmGr4wQhAZscLTSG51/O3QWQM7ZZx2xTEDi2ETx8E=
+SIZE (mercurial-1.4.tar.gz) = 1914030
diff --git a/devel/mercurial/pkg/PLIST b/devel/mercurial/pkg/PLIST
index 1b3e922aec9..59c744ff0a0 100644
--- a/devel/mercurial/pkg/PLIST
+++ b/devel/mercurial/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2009/08/01 03:21:46 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.13 2009/11/20 15:09:26 benoit Exp $
 %%SHARED%%
 bin/hg
 lib/python${MODPY_VERSION}/site-packages/hgext/
@@ -84,6 +84,8 @@ lib/python${MODPY_VERSION}/site-packages/hgext/rebase.py
 lib/python${MODPY_VERSION}/site-packages/hgext/rebase.pyc
 lib/python${MODPY_VERSION}/site-packages/hgext/record.py
 lib/python${MODPY_VERSION}/site-packages/hgext/record.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/relink.py
+lib/python${MODPY_VERSION}/site-packages/hgext/relink.pyc
 lib/python${MODPY_VERSION}/site-packages/hgext/share.py
 lib/python${MODPY_VERSION}/site-packages/hgext/share.pyc
 lib/python${MODPY_VERSION}/site-packages/hgext/transplant.py
@@ -147,8 +149,19 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/graphmod.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/graphmod.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/hbisect.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/hbisect.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/
 lib/python${MODPY_VERSION}/site-packages/mercurial/help.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/help.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/config.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/dates.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/diffs.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/environment.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/extensions.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/multirevs.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/patterns.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/revisions.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/templates.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/urls.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/hg.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/hg.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/
@@ -187,12 +200,44 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/hggettext
 lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/it.po
 lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/ja.po
 lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/pt_BR.po
+lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/sv.po
 lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/zh_CN.po
 lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/zh_TW.po
 lib/python${MODPY_VERSION}/site-packages/mercurial/ignore.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/ignore.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/keepalive.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/keepalive.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/da/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/da/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/da/LC_MESSAGES/hg.mo
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/de/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/de/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/de/LC_MESSAGES/hg.mo
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/el/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/el/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/el/LC_MESSAGES/hg.mo
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/fr/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/fr/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/fr/LC_MESSAGES/hg.mo
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/it/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/it/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/it/LC_MESSAGES/hg.mo
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/ja/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/ja/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/ja/LC_MESSAGES/hg.mo
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/pt_BR/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/pt_BR/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/sv/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/sv/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/sv/LC_MESSAGES/hg.mo
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/zh_CN/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/zh_CN/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/zh_TW/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/zh_TW/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
 lib/python${MODPY_VERSION}/site-packages/mercurial/localrepo.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/localrepo.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/lock.py
@@ -211,6 +256,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/mdiff.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/mdiff.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/merge.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/merge.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/minirst.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/minirst.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/node.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/node.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/parsers.so
@@ -240,6 +287,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/strutil.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/strutil.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/subrepo.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/subrepo.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/tags.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/tags.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/templatefilters.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/templatefilters.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/templater.py
@@ -404,7 +453,6 @@ share/mercurial/git-viz/git-diff-tree
 share/mercurial/git-viz/git-rev-list
 share/mercurial/git-viz/git-rev-tree
 share/mercurial/git-viz/hg-viz
-share/mercurial/hg-relink
 share/mercurial/hg-ssh
 share/mercurial/hgdiff
 share/mercurial/hgeditor