diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 97564859ede..3ad8ab56553 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2010/08/30 22:03:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.40 2010/11/13 09:24:52 ajacoutot Exp $
 # $FreeBSD: ports/devel/cvsweb/Makefile,v 1.28 2000/09/23 20:48:45 knu Exp $
 
 COMMENT=	WWW CGI script to browse CVS repository trees
 
 DISTNAME=	cvsweb-2.0.6
-REVISION =	8
+REVISION =	9
 CATEGORIES=	devel www
 HOMEPAGE=	http://www.freebsd.org/projects/cvsweb.html
 
@@ -41,7 +41,6 @@ do-install:
 .for file in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${CONFDIR}/cvsweb/${file}.dist
 .endfor
-	${INSTALL_DATA} ${FILESDIR}/README.chroot ${CONFDIR}/cvsweb/
 	${INSTALL_DATA_DIR} ${PREFIX}/icons/cvsweb
 .for file in ${ICONS}
 	${INSTALL_DATA} ${WRKSRC}/icons/${file} ${PREFIX}/icons/cvsweb/${file}
diff --git a/devel/cvsweb/pkg/PLIST b/devel/cvsweb/pkg/PLIST
index 804f50dcf75..dfbbde1054f 100644
--- a/devel/cvsweb/pkg/PLIST
+++ b/devel/cvsweb/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/14 23:43:55 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2010/11/13 09:24:52 ajacoutot Exp $
 cgi-bin/cvsweb
 conf/cvsweb/
-conf/cvsweb/README.chroot
 conf/cvsweb/cvsweb.conf-freebsd.dist
 conf/cvsweb/cvsweb.conf-netbsd.dist
 conf/cvsweb/cvsweb.conf-openbsd.dist
@@ -15,3 +14,5 @@ icons/cvsweb/miniback.gif
 icons/cvsweb/minidir.gif
 icons/cvsweb/minitext.gif
 icons/cvsweb/text.gif
+@cwd ${LOCALBASE}/share/doc/pkg-readmes
+${FULLPKGNAME}
diff --git a/devel/cvsweb/files/README.chroot b/devel/cvsweb/pkg/README
similarity index 97%
rename from devel/cvsweb/files/README.chroot
rename to devel/cvsweb/pkg/README
index 1bb0bd8b81d..51090440b2e 100644
--- a/devel/cvsweb/files/README.chroot
+++ b/devel/cvsweb/pkg/README
@@ -1,4 +1,5 @@
-# $OpenBSD: README.chroot,v 1.8 2009/11/25 19:54:19 naddy Exp $
+$OpenBSD: README,v 1.1 2010/11/13 09:24:52 ajacoutot Exp $
+
 # Author: Jolan Luff <jolan@openbsd.org>
 
 In order to make CVSweb operate in a chroot environment, it is