diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 0c1bfe1cf93..fa84bf0cec1 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2005/10/05 08:50:20 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2005/10/21 19:16:40 espie Exp $
 
 COMMENT=		"tool for managing library compile/link flags"
 
 VERSION=		0.19
 DISTNAME=		pkg-config-${VERSION}
-PKGNAME=		pkgconfig-${VERSION}
+PKGNAME=		pkgconfig-${VERSION}p0
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.freedesktop.org/software/pkgconfig/
@@ -20,6 +20,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c
+USE_LIBTOOL=		Yes
 
 CONFIGURE_STYLE=	gnu
 
diff --git a/devel/pkgconfig/patches/patch-pkg-config_1 b/devel/pkgconfig/patches/patch-pkg-config_1
new file mode 100644
index 00000000000..f9d5ce62d8d
--- /dev/null
+++ b/devel/pkgconfig/patches/patch-pkg-config_1
@@ -0,0 +1,25 @@
+$OpenBSD: patch-pkg-config_1,v 1.1 2005/10/21 19:16:40 espie Exp $
+--- pkg-config.1.orig	Fri Oct 21 21:02:54 2005
++++ pkg-config.1	Fri Oct 21 21:03:10 2005
+@@ -9,17 +9,17 @@
+ .  de DW
+ .    nr .oldwarn \n[.warn]
+ .    warn 0
+-.  .
++..
+ .  de EW
+ .    warn \n[.oldwarn]
+-.  .
++..
+ .\}
+ .el \
+ .\{ \
+ .  de DW
+-.  .
++..
+ .  de EW
+-.  .
++..
+ .\}
+ .
+ .TH pkg-config 1