diff -ruN -x 'work*' openafs.old/Makefile openafs/Makefile
--- openafs.old/Makefile	2011-08-20 11:43:54.000000000 -0400
+++ openafs/Makefile	2011-09-18 14:22:16.000000000 -0400
@@ -9,8 +9,8 @@
 PORTNAME=	openafs
 DISTVERSION=	${AFS_DISTVERSION}.${DBVERSION:S/-//g}
 CATEGORIES=	net kld
-MASTER_SITES=	http://dl.central.org/dl/openafs/candidate/${AFS_DISTVERSION}/:openafs \
-		http://dl.openafs.org/dl/openafs/candidate/${AFS_DISTVERSION}/:openafs \
+MASTER_SITES=	http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
+		http://dl.openafs.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
 		http://dl.central.org/dl/cellservdb/:gco \
 		http://grand.central.org/dl/cellservdb/:gco
 DISTFILES=	${PORTNAME}-${AFS_DISTVERSION}-src.tar.bz2:openafs \
@@ -27,7 +27,7 @@
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 LICENSE_PERMS=	auto-accept
 
-AFS_DISTVERSION=1.6.0pre7
+AFS_DISTVERSION=	1.6.0
 DBVERSION=	2011-08-14
 
 OPTIONS=	FUSE "Build afsd.fuse (enable fuse support)" off
diff -ruN -x 'work*' openafs.old/distinfo openafs/distinfo
--- openafs.old/distinfo	2011-08-19 13:46:28.000000000 -0400
+++ openafs/distinfo	2011-09-18 14:25:17.000000000 -0400
@@ -1,6 +1,6 @@
-SHA256 (openafs-1.6.0pre7-src.tar.bz2) = cad4faea83ab0ab8049930fdc1abf1208f5250cfb08bda1c406f62213e2893cc
-SIZE (openafs-1.6.0pre7-src.tar.bz2) = 14305674
-SHA256 (openafs-1.6.0pre7-doc.tar.bz2) = 5f9281aad3f00d589101e28d2b426158aabd2076c5c6d622622f3e86a447b8c7
-SIZE (openafs-1.6.0pre7-doc.tar.bz2) = 3475388
+SHA256 (openafs-1.6.0-src.tar.bz2) = e722a3b817655fe9b4e0d6e2c31ab1eb3d74947f51267311c85c43302e0644e6
+SIZE (openafs-1.6.0-src.tar.bz2) = 14308072
+SHA256 (openafs-1.6.0-doc.tar.bz2) = 326bcae377c74bfed5b09b5a52c3d18a317e42c30c3d76726c91b253d65b0659
+SIZE (openafs-1.6.0-doc.tar.bz2) = 3477311
 SHA256 (CellServDB.2011-08-14) = fa547873edda44682440d66b79d2002f7019fac520eb3a6d6d2c7e9e83ad8d89
 SIZE (CellServDB.2011-08-14) = 36836