diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index d27507c1c8f4..67c68c4aec09 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -2,15 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.8p1b5
+PORTVERSION=	4.2.8p1r2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/ \
  		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/:S/b/-beta/}
-# XXX
-WRKSRC=		${WRKDIR}/${DISTNAME:S/beta4$/beta5/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/P/p/:S/r/-RC/:S/b/-beta/}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
@@ -49,7 +47,7 @@ CONFIGURE_ARGS+=	--enable-${D}
 .endif
 .endfor
 
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}4
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 # XXX Temporary hack. Remember to remove this next commit.
 post-extract:
diff --git a/net/ntp-devel/distinfo b/net/ntp-devel/distinfo
index a9c75181e15e..d739c69098ab 100644
--- a/net/ntp-devel/distinfo
+++ b/net/ntp-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ntp-4.2.8p1-beta5.tar.gz) = fe4f2bec46bc75e39f44381140347f7777edc0dc5eab341e8ff5c72a3aab9b30
-SIZE (ntp-4.2.8p1-beta5.tar.gz) = 6759923
+SHA256 (ntp-4.2.8p1-RC2.tar.gz) = 4c64ce9ec6f0528c88defe4984b6bd25a00312dbe0511e7d119119253d9ebab7
+SIZE (ntp-4.2.8p1-RC2.tar.gz) = 6781813