diff --git a/devel/atlas-devel/Makefile b/devel/atlas-devel/Makefile
index 8cfa73db8c8c..fdc847091b49 100644
--- a/devel/atlas-devel/Makefile
+++ b/devel/atlas-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	Atlas
-PORTVERSION=	0.5.98
+PORTVERSION=	0.6.0.r1
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=worldforge
-DISTNAME=	${PORTNAME}-C++-${PORTVERSION}
+DISTNAME=	${PORTNAME}-C++-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A C++ reference implementation of the Atlas protocol
diff --git a/devel/atlas-devel/distinfo b/devel/atlas-devel/distinfo
index e9e52acc2011..5dd1201c581b 100644
--- a/devel/atlas-devel/distinfo
+++ b/devel/atlas-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (Atlas-C++-0.5.98.tar.bz2) = 7e0c05793bfa16085d3d82dd4a7aed41
-SIZE (Atlas-C++-0.5.98.tar.bz2) = 311732
+MD5 (Atlas-C++-0.6.0rc1.tar.bz2) = 1a51ac2581160f0c99c47866521c738d
+SIZE (Atlas-C++-0.6.0rc1.tar.bz2) = 327081
diff --git a/devel/atlas-devel/pkg-plist b/devel/atlas-devel/pkg-plist
index d6cf16e75683..b0021e4e6fa5 100644
--- a/devel/atlas-devel/pkg-plist
+++ b/devel/atlas-devel/pkg-plist
@@ -39,25 +39,25 @@ include/Atlas-C++-0.6/Atlas/Task.h
 include/Atlas-C++-0.6/Atlas/Version.h
 lib/libAtlas-0.6.a
 lib/libAtlas-0.6.so
-lib/libAtlas-0.6.so.0
+lib/libAtlas-0.6.so.1
 lib/libAtlasCodecs-0.6.a
 lib/libAtlasCodecs-0.6.so
-lib/libAtlasCodecs-0.6.so.0
+lib/libAtlasCodecs-0.6.so.1
 lib/libAtlasFilters-0.6.a
 lib/libAtlasFilters-0.6.so
-lib/libAtlasFilters-0.6.so.0
+lib/libAtlasFilters-0.6.so.1
 lib/libAtlasFunky-0.6.a
 lib/libAtlasFunky-0.6.so
-lib/libAtlasFunky-0.6.so.0
+lib/libAtlasFunky-0.6.so.1
 lib/libAtlasMessage-0.6.a
 lib/libAtlasMessage-0.6.so
-lib/libAtlasMessage-0.6.so.0
+lib/libAtlasMessage-0.6.so.1
 lib/libAtlasNet-0.6.a
 lib/libAtlasNet-0.6.so
-lib/libAtlasNet-0.6.so.0
+lib/libAtlasNet-0.6.so.1
 lib/libAtlasObjects-0.6.a
 lib/libAtlasObjects-0.6.so
-lib/libAtlasObjects-0.6.so.0
+lib/libAtlasObjects-0.6.so.1
 libdata/pkgconfig/atlascpp-0.6.pc
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/devel/eris/Makefile b/devel/eris/Makefile
index 07431faa0614..5cbdd608517f 100644
--- a/devel/eris/Makefile
+++ b/devel/eris/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	worldforge
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	WorldForge client entity library
 
-LIB_DEPENDS=	Atlas-0.6.0:${PORTSDIR}/devel/atlas-devel \
+LIB_DEPENDS=	Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \
 		skstream-0.3.3:${PORTSDIR}/net/skstream \
 		wfmath-0.3.3:${PORTSDIR}/math/wfmath \
 		sigc-2.0:${PORTSDIR}/devel/libsigc++20
diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile
index a1ec300ccc3f..68f3294c9bb0 100644
--- a/net/cyphesis/Makefile
+++ b/net/cyphesis/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=worldforge
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A server for WorldForge games
 
-LIB_DEPENDS=	Atlas-0.6.0:${PORTSDIR}/devel/atlas-devel \
+LIB_DEPENDS=	Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \
 		varconf-1.0.5:${PORTSDIR}/devel/varconf \
 		wfmath-0.3.3:${PORTSDIR}/math/wfmath \
 		mercator-0.2.4:${PORTSDIR}/devel/mercator \