diff --git a/net/cvsup-bin/Makefile b/net/cvsup-bin/Makefile
index 227d512d8ec9..edb6a7628145 100644
--- a/net/cvsup-bin/Makefile
+++ b/net/cvsup-bin/Makefile
@@ -12,18 +12,22 @@ MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/binaries/
 
 MAINTAINER=	jdp@freebsd.org
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 DISTFILES=	cvsup-freebsd-ix86-${PORTOBJFORMAT}-16.1${EXTRACT_SUFX}
 .else
-DISTFILES=	cvsup.nogui-freebsd-${MACHINE_ARCH}-16.1${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}/cvsup.nogui-bin-16.1
+.if ${OSVERSION} >= 400011
+DISTFILES=	cvsup-freebsd4-${MACHINE_ARCH}-16.1${EXTRACT_SUFX}
+.else
+BROKEN=		Not supported for pre-4.0 FreeBSD/Alpha versions
+.endif
 .endif
 
 NO_BUILD=	yes
 
 MAN1=		cvpasswd.1 cvsup.1
 MANCOMPRESSED=	yes
-NOT_FOR_ARCHS=	alpha
 STRIP=
 
 do-install:
@@ -33,4 +37,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/${file}.gz ${PREFIX}/man/man1
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/cvsup-bin/distinfo b/net/cvsup-bin/distinfo
index b9c69559fe2c..c33253b7bc42 100644
--- a/net/cvsup-bin/distinfo
+++ b/net/cvsup-bin/distinfo
@@ -1,2 +1,3 @@
 MD5 (cvsup-freebsd-ix86-aout-16.1.tar.gz) = f81c01faf7c5fbbfe4c871243d452871
 MD5 (cvsup-freebsd-ix86-elf-16.1.tar.gz) = d437c49af3068e23237d3e05755178a6
+MD5 (cvsup-freebsd4-alpha-16.1.tar.gz) = ac7daa10068f5d8bec4cf3c7242b2bbb
diff --git a/net/cvsupd-bin/Makefile b/net/cvsupd-bin/Makefile
index 82befdb78ade..5d16141c7952 100644
--- a/net/cvsupd-bin/Makefile
+++ b/net/cvsupd-bin/Makefile
@@ -12,17 +12,22 @@ MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/binaries/
 
 MAINTAINER=	jdp@freebsd.org
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 DISTFILES=	cvsupd-freebsd-ix86-${PORTOBJFORMAT}-16.1${EXTRACT_SUFX}
 .else
-DISTFILES=	cvsupd-freebsd-${MACHINE_ARCH}-16.1${EXTRACT_SUFX}
+.if ${OSVERSION} >= 400011
+DISTFILES=	cvsupd-freebsd4-${MACHINE_ARCH}-16.1${EXTRACT_SUFX}
+.else
+BROKEN=		Not supported for pre-4.0 FreeBSD/Alpha versions
+.endif
 .endif
 
 NO_BUILD=	yes
 
 MAN8=	cvsupd.8
 MANCOMPRESSED=	yes
-NOT_FOR_ARCHS=	alpha
 STRIP=
 
 do-install:
@@ -30,4 +35,4 @@ do-install:
 	    ${INSTALL_PROGRAM} cvsupd ${PREFIX}/sbin; \
 	    ${INSTALL_MAN} ${MAN8}.gz ${PREFIX}/man/man8
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/cvsupd-bin/distinfo b/net/cvsupd-bin/distinfo
index ddfe88570058..979c1fce292e 100644
--- a/net/cvsupd-bin/distinfo
+++ b/net/cvsupd-bin/distinfo
@@ -1,2 +1,3 @@
 MD5 (cvsupd-freebsd-ix86-aout-16.1.tar.gz) = a68694bbf9a694388f08f3e174610172
 MD5 (cvsupd-freebsd-ix86-elf-16.1.tar.gz) = 6a742a979214a96f5b766c5f00d89232
+MD5 (cvsupd-freebsd4-alpha-16.1.tar.gz) = 1e96355d58ca45ff888582fd7aadd144