diff --git a/infrastructure/db/fake.mtree b/infrastructure/db/fake.mtree
index 9e16e1d3a8c..3585efc0133 100644
--- a/infrastructure/db/fake.mtree
+++ b/infrastructure/db/fake.mtree
@@ -138,6 +138,8 @@
 		dict
 		..
 		doc
+			pkg-readmes
+			..
 		..
 		examples
 		..
diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index 70cd9b2e16c..e175b51a531 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.1046 2010/10/27 14:29:01 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.1047 2010/10/27 14:34:33 espie Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -517,7 +517,7 @@ BASE_PKGPATH := ${PKGPATH}
 _FLAVOR_EXT2 :=
 BUILD_PKGPATH := ${PKGPATH}
 _PKG_ARGS =
-_README_DIR = ${PREFIX}/share/doc/pkg-readmes/
+_README_DIR = ${LOCALBASE}/share/doc/pkg-readmes
 
 # (applies only to PLIST for now)
 .if !empty(FLAVORS)
@@ -2477,14 +2477,16 @@ ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
 .endfor
 .if ${MULTI_PACKAGES} == "-"
 	@if test -e ${PKGDIR}/README; then \
-		${INSTALL_DATA_DIR} ${WRKINST}${_README_DIR}; \
-		${SUDO} ${SUBST_CMD} -c ${PKGDIR}/README ${WRKINST}${_README_DIR}/${FULLPKGNAME}; \
+		r=${WRKINST}${_README_DIR}/${FULLPKGNAME}; \
+		echo "Installing ${PKGDIR}/README as $$r"; \
+		${SUDO} ${SUBST_CMD} -c ${PKGDIR}/README $$r; \
 	fi
 .else
 .  for _s in ${MULTI_PACKAGES}
 	@if test -e ${PKGDIR}/README-${_s}; then \
-		${INSTALL_DATA_DIR} ${WRKINST}${_README_DIR}; \
-		${SUDO} ${SUBST_CMD} -c ${PKGDIR}/README-${_s} ${WRKINST}${_README_DIR}/${FULLPKGNAME${_s}}; \
+		r=${WRKINST}${_README_DIR}/${FULLPKGNAME${_s}}; \
+		echo "Installing ${PKGDIR}/README-${_s} as $$r"; \
+		${SUDO} ${SUBST_CMD} -c ${PKGDIR}/README-${_s} $$r; \
 	fi
 .  endfor
 .endif