diff --git a/lang/tcl/8.5/Makefile b/lang/tcl/8.5/Makefile
index 8e2eb985d0f..f4be57597a0 100644
--- a/lang/tcl/8.5/Makefile
+++ b/lang/tcl/8.5/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/18 21:50:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/15 18:26:38 jasper Exp $
 
 COMMENT =		Tool Command Language
 
 DISTNAME =		tcl8.5.8
-PKGNAME =		tcl-8.5.8p0
+PKGNAME =		tcl-8.5.8
+REVISION =		1
 SHARED_LIBS =		tcl85 0.5
 CATEGORIES =		lang lang/tcl
 HOMEPAGE =		http://www.tcl.tk/
@@ -40,7 +41,7 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 			--sysconfdir="${SYSCONFDIR}" \
 			--enable-man-symlinks \
 			--disable-rpath
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 CONFIGURE_ENV +=	SHLIB_VERSION="${LIBtcl85_VERSION}"
 
@@ -65,13 +66,7 @@ DOCDIR =		${PREFIX}/share/doc/tcltk8.5
 pre-regress:
 	@mkdir -p ${TESTHOME}
 
-pre-configure:
-	cp ${FILESDIR}/README.OpenBSD ${WRKBUILD}
-	${SUBST_CMD} ${WRKBUILD}/README.OpenBSD
-
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKBUILD}/README.OpenBSD ${DOCDIR}
 .if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
 	ln -s libtcl85.a ${PREFIX}/lib/libtcl85_pic.a
 	ln -s libtclstub85.a ${PREFIX}/lib/libtclstub85_pic.a
diff --git a/lang/tcl/8.5/pkg/PLIST b/lang/tcl/8.5/pkg/PLIST
index 701a04dec4b..e428b244450 100644
--- a/lang/tcl/8.5/pkg/PLIST
+++ b/lang/tcl/8.5/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/11/21 02:50:23 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.6 2010/11/15 18:26:39 jasper Exp $
 @option no-default-conflict
 @conflict tcl->=8.5,<8.6
 %%SHARED%%
@@ -959,5 +959,4 @@ lib/tcl8/8.4/platform/shell-1.1.4.tm
 lib/tcl8/8.5/
 lib/tcl8/8.5/msgcat-1.4.2.tm
 lib/tcl8/8.5/tcltest-2.3.2.tm
-share/doc/tcltk8.5/
-share/doc/tcltk8.5/README.OpenBSD
+share/doc/pkg-readmes/${FULLPKGNAME}
diff --git a/lang/tcl/8.5/files/README.OpenBSD b/lang/tcl/8.5/pkg/README
similarity index 87%
rename from lang/tcl/8.5/files/README.OpenBSD
rename to lang/tcl/8.5/pkg/README
index a0cc2248a54..446f632ee63 100644
--- a/lang/tcl/8.5/files/README.OpenBSD
+++ b/lang/tcl/8.5/pkg/README
@@ -1,4 +1,4 @@
-# $ OpenBSD$
+# $OpenBSD: README,v 1.1 2010/11/15 18:26:39 jasper Exp $
 
 cat << "EOTEXT" > /dev/null
 
@@ -28,36 +28,36 @@ Files / Directories
 Configuration files
 tclConfig.sh, tkConfig.sh
 normally in
-${PREFIX}/lib
+${TRUEPREFIX}/lib
 now in
-${PREFIX}/lib/tcl8.5, ${PREFIX}/lib/tk8.5
+${TRUEPREFIX}/lib/tcl8.5, ${TRUEPREFIX}/lib/tk8.5
 
 Include files ('public' - see below)
 *.h
 normally in
-${PREFIX}/include
+${TRUEPREFIX}/include
 now in
-${PREFIX}/include/tcl8.5, ${PREFIX}/include/tk8.5
+${TRUEPREFIX}/include/tcl8.5, ${TRUEPREFIX}/include/tk8.5
 
 Manual pages
 *.1, *.3, *.n
 normally in
-${PREFIX}/man
+${TRUEPREFIX}/man
 now in
-${PREFIX}/lib/tcl8.5/man, ${PREFIX}/lib/tk8.5/man
+${TRUEPREFIX}/lib/tcl8.5/man, ${TRUEPREFIX}/lib/tk8.5/man
 
 Demos
 *.tcl, *
 normally in
-${PREFIX}/lib/tk8.5/demos
+${TRUEPREFIX}/lib/tk8.5/demos
 now in
-${PREFIX}/share/examples/tk8.5
+${TRUEPREFIX}/share/examples/tk8.5
 
 
 Additional Header Files
 
 Additional (what Tcl/Tk calls 'private') include (.h) files are installed
-under ${PREFIX}/include/tcl8.5 and ${PREFIX}/include/tk8.5 in a
+under ${TRUEPREFIX}/include/tcl8.5 and ${TRUEPREFIX}/include/tk8.5 in a
 directory structure which mimics the Tcl and Tk source code directory
 layouts.  Some software that compiles and links against Tcl or Tk
 requires these 'private' headers and therefore assumes that the Tcl or Tk
@@ -117,8 +117,8 @@ cat << "EOPATCH" | patch -p0 -s -o - /etc/man.conf
  _whatdb		/usr/share/man/whatis.db
  _whatdb		/usr/local/man/whatis.db
  _whatdb		/usr/X11R6/man/whatis.db
-+_whatdb		/usr/local/lib/tcl8.5/man/whatis.db
-+_whatdb		/usr/local/lib/tk8.5/man/whatis.db
++_whatdb		${TRUEPREFIX}/lib/tcl8.5/man/whatis.db
++_whatdb		${TRUEPREFIX}/lib/tk8.5/man/whatis.db
  
  # Subdirectories for paths ending in '/', IN SEARCH ORDER.
  _subdir		cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat5 man5 cat7 man7 cat4 man4 cat9 man9 cat3p man3p cat3f man3f catn mann
@@ -133,8 +133,8 @@ cat << "EOPATCH" | patch -p0 -s -o - /etc/man.conf
  X11		/usr/X11R6/man/
  X11R6		/usr/X11R6/man/
  local		/usr/local/man/
-+tcl		/usr/local/lib/tcl8.5/man/
-+tk		/usr/local/lib/tk8.5/man/
++tcl		${TRUEPREFIX}/lib/tcl8.5/man/
++tk		${TRUEPREFIX}/lib/tk8.5/man/
  
  # Specific section/directory combinations.
  1		/usr/{share,X11R6,local}/man/{cat,man}1