diff --git a/ports-mgmt/portdowngrade/Makefile b/ports-mgmt/portdowngrade/Makefile
index 0d3ec4796838..f3c1b0656f74 100644
--- a/ports-mgmt/portdowngrade/Makefile
+++ b/ports-mgmt/portdowngrade/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	portdowngrade
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	h.eichmann@gmx.de
-COMMENT=Sets a port back to a previous version
+COMMENT=	Sets a port back to a previous version
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
@@ -20,6 +20,9 @@ POPT_INCLUDE=	`pkg_info -xL ^popt | ${GREP} popt.h | ${SED} -e 's?/popt.h??'`
 POPT_LIB=	`pkg_info -xL ^popt | ${GREP} libpopt.a | ${SED} -e 's?/libpopt.a??'`
 CONFIGURE_ENV=	CPPFLAGS="-I${POPT_INCLUDE}" \
 		LIBS="-lpopt -L${POPT_LIB}"
+.if defined(DEFAULT_CVS_SERVER)
+CONFIGURE_ARGS+=	--enable-default-server=${DEFAULT_CVS_SERVER}
+.endif
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -30,4 +33,14 @@ USE_BZIP2=	yes
 MAN1=		portdowngrade.1
 PLIST_FILES=	sbin/portdowngrade
 
+pre-everything::
+.if !defined(DEFAULT_CVS_SERVER)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Press CTRL-C and define DEFAULT_CVS_SERVER"
+	@${ECHO_MSG} "(e.g. make DEFAULT_CVS_SERVER=\":pserver:anoncvs@anoncvs. ... .FreeBSD.org:/home/ncvs\" install)"
+	@${ECHO_MSG} "if you want to use a special CVS server as default."
+	@${ECHO_MSG} ""
+	@sleep 3
+.endif
+
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portdowngrade/distinfo b/ports-mgmt/portdowngrade/distinfo
index 572be92f0d40..b110dc96e17c 100644
--- a/ports-mgmt/portdowngrade/distinfo
+++ b/ports-mgmt/portdowngrade/distinfo
@@ -1,2 +1,2 @@
-MD5 (portdowngrade-0.4.tar.bz2) = 9ad4d2351ac10851082a1b7d58c52cd6
-SIZE (portdowngrade-0.4.tar.bz2) = 68832
+MD5 (portdowngrade-0.5.tar.bz2) = e43e6c91b2d1a92517131d48ea023e6f
+SIZE (portdowngrade-0.5.tar.bz2) = 73380
diff --git a/sysutils/portdowngrade/Makefile b/sysutils/portdowngrade/Makefile
index 0d3ec4796838..f3c1b0656f74 100644
--- a/sysutils/portdowngrade/Makefile
+++ b/sysutils/portdowngrade/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	portdowngrade
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	h.eichmann@gmx.de
-COMMENT=Sets a port back to a previous version
+COMMENT=	Sets a port back to a previous version
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
@@ -20,6 +20,9 @@ POPT_INCLUDE=	`pkg_info -xL ^popt | ${GREP} popt.h | ${SED} -e 's?/popt.h??'`
 POPT_LIB=	`pkg_info -xL ^popt | ${GREP} libpopt.a | ${SED} -e 's?/libpopt.a??'`
 CONFIGURE_ENV=	CPPFLAGS="-I${POPT_INCLUDE}" \
 		LIBS="-lpopt -L${POPT_LIB}"
+.if defined(DEFAULT_CVS_SERVER)
+CONFIGURE_ARGS+=	--enable-default-server=${DEFAULT_CVS_SERVER}
+.endif
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -30,4 +33,14 @@ USE_BZIP2=	yes
 MAN1=		portdowngrade.1
 PLIST_FILES=	sbin/portdowngrade
 
+pre-everything::
+.if !defined(DEFAULT_CVS_SERVER)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Press CTRL-C and define DEFAULT_CVS_SERVER"
+	@${ECHO_MSG} "(e.g. make DEFAULT_CVS_SERVER=\":pserver:anoncvs@anoncvs. ... .FreeBSD.org:/home/ncvs\" install)"
+	@${ECHO_MSG} "if you want to use a special CVS server as default."
+	@${ECHO_MSG} ""
+	@sleep 3
+.endif
+
 .include <bsd.port.mk>
diff --git a/sysutils/portdowngrade/distinfo b/sysutils/portdowngrade/distinfo
index 572be92f0d40..b110dc96e17c 100644
--- a/sysutils/portdowngrade/distinfo
+++ b/sysutils/portdowngrade/distinfo
@@ -1,2 +1,2 @@
-MD5 (portdowngrade-0.4.tar.bz2) = 9ad4d2351ac10851082a1b7d58c52cd6
-SIZE (portdowngrade-0.4.tar.bz2) = 68832
+MD5 (portdowngrade-0.5.tar.bz2) = e43e6c91b2d1a92517131d48ea023e6f
+SIZE (portdowngrade-0.5.tar.bz2) = 73380