diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index 1400353ebfd..ac74a5a325f 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2000/04/09 17:36:14 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2000/05/28 17:27:52 espie Exp $
 
 DISTNAME=	DBD-Pg-0.93
 PKGNAME=	p5-DBD-Pg-0.93
 CATEGORIES=	databases perl5
 NEED_VERSION=	 1.230
-FAKE=No
+FAKE=		Yes
 
 MAINTAINER=	kevlo@openbsd.org
 
@@ -16,12 +16,26 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
 
-BUILD_DEPENDS=	/usr/local/libdata/perl5/site_perl/i386-openbsd/DBI.pm::databases/p5-DBI \
-		pq.1.::databases/postgresql
+BUILD_DEPENDS= /usr/local/libdata/perl5/site_perl/i386-openbsd/DBI.pm::databases/p5-DBI 
+LIB_DEPENDS= pq.2.::databases/postgresql
 
 CONFIGURE_ENV+=	"POSTGRES_HOME=${PREFIX}/pgsql"
 
+pre-fake:
+	@mkdir -p ${WRKINST}`/usr/bin/perl -e 'use Config; print $$Config{installarchlib}, "\n";'`
+
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} /usr/bin/perl Makefile.PL
+	@arch=`/usr/bin/perl -e 'use Config; print $$Config{archname}, "\n";'`; \
+	cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} \
+	/usr/bin/perl Makefile.PL \
+	    PREFIX='$${DESTDIR}${PREFIX}' \
+	    INSTALLSITELIB='$${DESTDIR}${PREFIX}/libdata/perl5/site_perl' \
+	    INSTALLSITEARCH="\$${INSTALLSITELIB}/$$arch" \
+	    INSTALLPRIVLIB='$${DESTDIR}/usr/libdata/perl5' \
+	    INSTALLARCHLIB="\$${INSTALLPRIVLIB}/$$arch" \
+	    INSTALLMAN1DIR='$${DESTDIR}${PREFIX}/man/man1' \
+	    INSTALLMAN3DIR='$${DESTDIR}${PREFIX}/man/man3' \
+	    INSTALLBIN='$${PREFIX}/bin' \
+	    INSTALLSCRIPT='$${INSTALLBIN}'
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Pg/pkg/PLIST b/databases/p5-DBD-Pg/pkg/PLIST
deleted file mode 100644
index ef8ea552ce1..00000000000
--- a/databases/p5-DBD-Pg/pkg/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-libdata/perl5/site_perl/i386-openbsd/DBD/Pg.pm 
-libdata/perl5/site_perl/i386-openbsd/DBD/dbd-pg.pod
-libdata/perl5/site_perl/i386-openbsd/auto/DBD/Pg/Pg.bs
-libdata/perl5/site_perl/i386-openbsd/auto/DBD/Pg/Pg.so
-libdata/perl5/site_perl/i386-openbsd/auto/DBD/Pg/.packlist
-@dirrm libdata/perl5/site_perl/i386-openbsd/auto/DBD/Pg
diff --git a/databases/p5-DBD-Pg/pkg/PLIST.sed b/databases/p5-DBD-Pg/pkg/PLIST.sed
new file mode 100644
index 00000000000..fba7e0a77e5
--- /dev/null
+++ b/databases/p5-DBD-Pg/pkg/PLIST.sed
@@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST.sed,v 1.1 2000/05/28 17:27:53 espie Exp $
+libdata/perl5/site_perl/@ARCH@-openbsd/DBD/Pg.pm
+libdata/perl5/site_perl/@ARCH@-openbsd/DBD/dbd-pg.pod
+libdata/perl5/site_perl/@ARCH@-openbsd/auto/DBD/Pg/.packlist
+libdata/perl5/site_perl/@ARCH@-openbsd/auto/DBD/Pg/Pg.bs
+libdata/perl5/site_perl/@ARCH@-openbsd/auto/DBD/Pg/Pg.so
+man/man3/DBD::Pg.3p
+man/man3/DBD::dbd-pg.3p
+@dirrm libdata/perl5/site_perl/@ARCH@-openbsd/auto/DBD/Pg