diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 072ebd948de..decfb0b8a38 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2002/12/29 19:43:50 fgsch Exp $
+# $OpenBSD: Makefile,v 1.14 2003/02/12 07:37:35 pvalchev Exp $
 
 COMMENT=	"interpreted language for scientific computing"
 
 VERSION=	1.5
 DISTNAME=	yorick-${VERSION}.08
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	math devel
 MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/
 EXTRACT_SUFX=	.tgz
@@ -19,8 +20,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=	Yes
 
+Y_SITE=		${PREFIX}/share/yorick
 CONFIGURE_STYLE= simple
-Y_DIR=		${PREFIX}/share/yorick
+MAKE_FLAGS=	Y_SITE="${Y_SITE}"
 
 WRKDIST=	${WRKDIR}/yorick-${VERSION}
 
@@ -40,10 +42,12 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/gist.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yorick
 	${INSTALL_DATA} ${WRKSRC}/doc/*.{doc,tex,ps,pdf} ${PREFIX}/share/doc/yorick
-	${INSTALL_DATA_DIR} ${Y_DIR}
-	${INSTALL_DATA_DIR} ${Y_DIR}/g
-	${INSTALL_DATA_DIR} ${Y_DIR}/i
-	${INSTALL_DATA} ${WRKSRC}/g/* ${Y_DIR}/g
-	${INSTALL_DATA} ${WRKSRC}/i/* ${Y_DIR}/i
+	${INSTALL_DATA_DIR} ${Y_SITE}
+	${INSTALL_DATA_DIR} ${Y_SITE}/g
+	${INSTALL_DATA_DIR} ${Y_SITE}/i
+	${INSTALL_DATA_DIR} ${Y_SITE}/i0
+	${INSTALL_DATA} ${WRKSRC}/g/* ${Y_SITE}/g
+	${INSTALL_DATA} ${WRKSRC}/i/* ${Y_SITE}/i
+	${INSTALL_DATA} ${WRKSRC}/i0/* ${Y_SITE}/i0
 
 .include <bsd.port.mk>
diff --git a/math/yorick/pkg/PLIST b/math/yorick/pkg/PLIST
index ddee02ce407..0883a5d944f 100644
--- a/math/yorick/pkg/PLIST
+++ b/math/yorick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/02/20 23:31:29 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/02/12 07:37:36 pvalchev Exp $
 bin/gist
 bin/yorick
 include/README
@@ -165,6 +165,16 @@ share/yorick/i/testp.i
 share/yorick/i/txpath.i
 share/yorick/i/ylmdec.i
 share/yorick/i/zroots.i
+share/yorick/i0/README
+share/yorick/i0/drat.i
+share/yorick/i0/fft.i
+share/yorick/i0/graph.i
+share/yorick/i0/hex.i
+share/yorick/i0/matrix.i
+share/yorick/i0/paths.i
+share/yorick/i0/std.i
+share/yorick/i0/stdx.i
+@dirrm share/yorick/i0
 @dirrm share/yorick/i
 @dirrm share/yorick/g
 @dirrm share/yorick