diff --git a/books/mason-book/Makefile b/books/mason-book/Makefile
index 54531c80d86..93ea8a3fc49 100644
--- a/books/mason-book/Makefile
+++ b/books/mason-book/Makefile
@@ -1,12 +1,13 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/05/29 23:52:29 avsm Exp $
+# $OpenBSD: Makefile,v 1.2 2003/06/03 15:40:11 avsm Exp $
 
 COMMENT=	"book on embedding Perl in HTML with Mason"
+CATEGORIES=	books 
 
 # unversioned, so impose a version on it
 V=		1.0
 DISTNAME=	mason-book
 PKGNAME=	${DISTNAME}-${V}
-CATEGORIES=	books 
+DIST_SUBDIR=	mason-book-${V}
 
 HOMEPAGE=	http://www.masonbook.com/
 MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
@@ -26,7 +27,6 @@ PERMIT_PACKAGE_FTP=	Yes
 
 WRKDIST=	${WRKDIR}
 INSTALL_LOC=	${PREFIX}/share/doc/mason-book
-SUBST_VARS=	INSTALL_LOC
 NO_REGRESS=	Yes
 
 # pod files order important for TOC generation
diff --git a/books/mason-book/distinfo b/books/mason-book/distinfo
index 3f36c6e58cd..80a29b2f495 100644
--- a/books/mason-book/distinfo
+++ b/books/mason-book/distinfo
@@ -1,3 +1,3 @@
-MD5 (mason-book.tar.gz) = 65bd9e07497d868626c70ae1fac815de
-RMD160 (mason-book.tar.gz) = 22b159f3e53fc34de65db7c38df2b254b15e196b
-SHA1 (mason-book.tar.gz) = 62d9adc064e08edd05effd019292e8b293ef61bd
+MD5 (mason-book-1.0/mason-book.tar.gz) = 65bd9e07497d868626c70ae1fac815de
+RMD160 (mason-book-1.0/mason-book.tar.gz) = 22b159f3e53fc34de65db7c38df2b254b15e196b
+SHA1 (mason-book-1.0/mason-book.tar.gz) = 62d9adc064e08edd05effd019292e8b293ef61bd