diff --git a/emulators/xen-kernel/Makefile b/emulators/xen-kernel/Makefile
index 72f86d7e8c3e..9fa6bbb0a952 100644
--- a/emulators/xen-kernel/Makefile
+++ b/emulators/xen-kernel/Makefile
@@ -3,11 +3,9 @@
 PORTNAME=	xen
 PKGNAMESUFFIX=	-kernel
 PORTVERSION=	4.7.0
-PORTREVISION=   1
-RCVERSION=	6
-DISTNAME=	${PORTNAME}-${DISTVERSION}-rc${RCVERSION}
+PORTREVISION=   2
 CATEGORIES=	emulators
-MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${DISTVERSION}-rc${RCVERSION}/
+MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
 
 MAINTAINER=	royger@FreeBSD.org
 COMMENT=	Hypervisor using a microkernel design
diff --git a/emulators/xen-kernel/distinfo b/emulators/xen-kernel/distinfo
index 20ede0788069..0a74ef3ee7e1 100644
--- a/emulators/xen-kernel/distinfo
+++ b/emulators/xen-kernel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466081623
-SHA256 (xen-4.7.0-rc6.tar.gz) = d25e5e84b4d8f279be9a1a42b5c07c1b50cff48b49201e32ebf3809df187b428
-SIZE (xen-4.7.0-rc6.tar.gz) = 20707097
+TIMESTAMP = 1467644898
+SHA256 (xen-4.7.0.tar.gz) = be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623
+SIZE (xen-4.7.0.tar.gz) = 20702550
diff --git a/emulators/xen/Makefile b/emulators/xen/Makefile
index 4c573013e462..b585680685ac 100644
--- a/emulators/xen/Makefile
+++ b/emulators/xen/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xen
 PORTVERSION=	4.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 
 MAINTAINER=	royger@FreeBSD.org
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile
index 0287f511a489..ecd074bf22e0 100644
--- a/sysutils/xen-tools/Makefile
+++ b/sysutils/xen-tools/Makefile
@@ -3,11 +3,9 @@
 PORTNAME=	xen
 PKGNAMESUFFIX=	-tools
 PORTVERSION=	4.7.0
-PORTREVISION=   1
-RCVERSION=	6
-DISTNAME=	${PORTNAME}-${DISTVERSION}-rc${RCVERSION}
+PORTREVISION=   2
 CATEGORIES=	sysutils emulators
-MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${DISTVERSION}-rc${RCVERSION}/
+MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
 
 MAINTAINER=	royger@FreeBSD.org
 COMMENT=	Xen management tool, based on LibXenlight
diff --git a/sysutils/xen-tools/distinfo b/sysutils/xen-tools/distinfo
index 1bc58d03d8e6..d2a0b57fff71 100644
--- a/sysutils/xen-tools/distinfo
+++ b/sysutils/xen-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466081611
-SHA256 (xen-4.7.0-rc6.tar.gz) = d25e5e84b4d8f279be9a1a42b5c07c1b50cff48b49201e32ebf3809df187b428
-SIZE (xen-4.7.0-rc6.tar.gz) = 20707097
+TIMESTAMP = 1467644940
+SHA256 (xen-4.7.0.tar.gz) = be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623
+SIZE (xen-4.7.0.tar.gz) = 20702550