diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 0b24cbd04688..56cbdf6443a1 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cvsweb
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.4
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.iDaemons.org/distfiles/
-MASTER_SITE_SUBDIR=	knu
+		http://people.FreeBSD.org/~scop/cvsweb/
+MASTER_SITE_SUBDIR=	scop
 
 MAINTAINER=	freebsd-cvsweb@FreeBSD.org
 
diff --git a/devel/cvsweb/distinfo b/devel/cvsweb/distinfo
index ef7ba99bd9b6..0aab528e90f0 100644
--- a/devel/cvsweb/distinfo
+++ b/devel/cvsweb/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-2.0.3.tar.gz) = 349d85dcef852f6b8a119a4b762426eb
+MD5 (cvsweb-2.0.4.tar.gz) = 8f0e7051c41767ca6133e2840deef572
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 0b24cbd04688..56cbdf6443a1 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cvsweb
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.4
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.iDaemons.org/distfiles/
-MASTER_SITE_SUBDIR=	knu
+		http://people.FreeBSD.org/~scop/cvsweb/
+MASTER_SITE_SUBDIR=	scop
 
 MAINTAINER=	freebsd-cvsweb@FreeBSD.org
 
diff --git a/devel/cvsweb3/distinfo b/devel/cvsweb3/distinfo
index ef7ba99bd9b6..0aab528e90f0 100644
--- a/devel/cvsweb3/distinfo
+++ b/devel/cvsweb3/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-2.0.3.tar.gz) = 349d85dcef852f6b8a119a4b762426eb
+MD5 (cvsweb-2.0.4.tar.gz) = 8f0e7051c41767ca6133e2840deef572