diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index 324b0b3..8d5e7a7 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hg-git
-PORTVERSION=	0.1.0
+PORTVERSION=	0.2.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/hg-git/distinfo b/devel/hg-git/distinfo
index 5e9d876..6c3c987 100644
--- a/devel/hg-git/distinfo
+++ b/devel/hg-git/distinfo
@@ -1,3 +1,3 @@
-MD5 (hg-git-0.1.0.tar.gz) = 2c083d92dbf89f228ae28a0fc7805d9e
-SHA256 (hg-git-0.1.0.tar.gz) = 8745c331f010dbdda6b1343a852ef3fb242d5d29196c7dd1197e27e6051212d8
-SIZE (hg-git-0.1.0.tar.gz) = 11351
+MD5 (hg-git-0.2.1.tar.gz) = cad6487d5c887b15ea97951e885cf5ad
+SHA256 (hg-git-0.2.1.tar.gz) = 821cd26a5173ae34c79073dfb00a1e863c5c45ff0741c4fc6f417fd4990780ac
+SIZE (hg-git-0.2.1.tar.gz) = 11291
diff --git a/devel/hg-git/pkg-descr b/devel/hg-git/pkg-descr
index f2b9587..390de85 100644
--- a/devel/hg-git/pkg-descr
+++ b/devel/hg-git/pkg-descr
@@ -11,4 +11,12 @@ data does not get lost in translation.
 This plugin is implemented entirely in Python - there are no Git binary
 dependencies, you do not need to have Git installed on your system.
 
+*** WARNING: Do not use this software in data critical production environments,
+only in safe test environments! This software is still BETA!
+
+It is basically feature complete and pretty stable now, but there could be
+still some edge cases. The user interface could also still be changed. However,
+there are now a lot of people using it effectively, so please test it yourself
+and report encountered bugs upstream (see website). Thanks! ***
+
 WWW:	http://hg-git.github.com/
diff --git a/devel/hg-git/pkg-message b/devel/hg-git/pkg-message
index e2428aa..693fb47 100644
--- a/devel/hg-git/pkg-message
+++ b/devel/hg-git/pkg-message
@@ -1,6 +1,7 @@
 ====
 
-*** Attention! ***
+*** WARNING: Do not use this software in data critical production environments,
+only in safe test environments! This software is still BETA! ***
 
 To enable the Hg-Git extension make sure you have the following lines in your
 Mercurial global configuration file '~/.hgrc':