diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index 6dc6dee85db4..acedb03ae104 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	2.0RC3-4
+DISTVERSION=	2.0${RCVER:U}
 PORTEPOCH=	8
 CATEGORIES=	net-im java
-MASTER_SITES=	${MASTER_SITE_LOCAL}		\
-		http://files.mercury.im/${PORTVERSION:R:R}/release/
-MASTER_SITE_SUBDIR=	thierry/${PORTNAME}
-DISTNAME=	${DISTVERSION}
-DIST_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_LOCAL}	\
+		http://files.mercury.im/${PORTVERSION:R}/release/${RCVER}/
+MASTER_SITE_SUBDIR=	thierry/${PORTNAME}/${RCVER}
+DISTNAME=	core
+DIST_SUBDIR=	${PORTNAME}/${RCVER}
 
 # Maintainership available: drop me a line if interested
 MAINTAINER=	thierry@FreeBSD.org
@@ -22,6 +22,8 @@ COMMENT=	Java Based MSN client
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper	\
 		jmfinit:${PORTSDIR}/java/jmf
 
+RCVER=		rc6
+
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
diff --git a/net-im/mercury/distinfo b/net-im/mercury/distinfo
index 54a8d3444782..5e95a14d8e1d 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,6 +1,6 @@
-MD5 (mercury/2.0RC3-4.zip) = c0cae1a16d9406d6fe053d0d8d93e4c8
-SHA256 (mercury/2.0RC3-4.zip) = 8fb82402cc6698af5435230ffbb80623b4b93f6668cb461e6335af9362958720
-SIZE (mercury/2.0RC3-4.zip) = 3973314
-MD5 (mercury/VidConf-libs.jar) = 873b832b9ccc9de4783d1770aaee6c65
-SHA256 (mercury/VidConf-libs.jar) = 13c7b81b1f60c10c347d5e3616c3a9881dea130891f2ebcdd2d7ffec03b0fe80
-SIZE (mercury/VidConf-libs.jar) = 617362
+MD5 (mercury/rc6/core.zip) = dbc2a9f65f68ca699ab3652d0a480851
+SHA256 (mercury/rc6/core.zip) = 7b5af03d224300475ee6bc99836509bb8c6cec4ad277801670d22388099b8c5d
+SIZE (mercury/rc6/core.zip) = 3990091
+MD5 (mercury/rc6/VidConf-libs.jar) = 873b832b9ccc9de4783d1770aaee6c65
+SHA256 (mercury/rc6/VidConf-libs.jar) = 13c7b81b1f60c10c347d5e3616c3a9881dea130891f2ebcdd2d7ffec03b0fe80
+SIZE (mercury/rc6/VidConf-libs.jar) = 617362
diff --git a/net-im/mercury/pkg-descr b/net-im/mercury/pkg-descr
index d1aea49a202a..4d1668ba1744 100644
--- a/net-im/mercury/pkg-descr
+++ b/net-im/mercury/pkg-descr
@@ -20,4 +20,4 @@ your normal messenger doesn't have, for example: port forwarding for faster file
 transfer, handling of more accounts, having different MSN names for each
 contact, etc.
 
-WWW: http://www.mercury.to/
+WWW: http://www.mercury.im/
diff --git a/net-im/mercury/pkg-plist b/net-im/mercury/pkg-plist
index f6e2edbcf696..8fa06865e9bc 100644
--- a/net-im/mercury/pkg-plist
+++ b/net-im/mercury/pkg-plist
@@ -17,7 +17,7 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/MusicPlayerInfo/default.xml
 %%INSTDIR%%/resources/AppData/Plugins/.keep_me
 %%INSTDIR%%/resources/AppData/Skins/.keep_me
-%%INSTDIR%%/resources/AppData/Sounds/MSNMessage.mp3
+%%INSTDIR%%/resources/AppData/Sounds/MSN Message.wav
 %%INSTDIR%%/resources/AppData/SplashWindow/Default.zip
 %%INSTDIR%%/resources/AppData/SplashWindow/EinsteinYellow.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/Danny.zip