diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index f34a62c86df..8903d000c33 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.41 2002/10/30 23:55:27 brad Exp $
+# $OpenBSD: Makefile,v 1.42 2003/01/25 05:52:21 brad Exp $
 
 COMMENT=	"library for manipulating PNG images"
 
 DISTNAME=	libpng-1.2.5
-PKGNAME=	${DISTNAME:S/lib//}
+PKGNAME=	${DISTNAME:S/lib//}p1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/}
 
diff --git a/graphics/png/patches/patch-scripts_makefile_openbsd b/graphics/png/patches/patch-scripts_makefile_openbsd
index 9047e6ccfdc..a72b171d08f 100644
--- a/graphics/png/patches/patch-scripts_makefile_openbsd
+++ b/graphics/png/patches/patch-scripts_makefile_openbsd
@@ -1,13 +1,14 @@
-$OpenBSD: patch-scripts_makefile_openbsd,v 1.3 2002/10/30 23:55:27 brad Exp $
+$OpenBSD: patch-scripts_makefile_openbsd,v 1.4 2003/01/25 05:52:21 brad Exp $
 --- scripts/makefile.openbsd.orig	Thu Oct  3 07:32:34 2002
-+++ scripts/makefile.openbsd	Tue Oct 29 11:46:03 2002
-@@ -1,13 +1,15 @@
++++ scripts/makefile.openbsd	Sat Jan 25 00:32:05 2003
+@@ -1,13 +1,16 @@
 -# makefile for libpng
 +# makefile for libpng under OpenBSD
  # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
  # For conditions of distribution and use, see copyright notice in png.h
  
  PREFIX?= /usr/local
++BINDIR=	${PREFIX}/bin
  LIBDIR=	${PREFIX}/lib
 -MANDIR= ${PREFIX}/man/cat
 +MANDIR=	${PREFIX}/man/cat
@@ -21,7 +22,7 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.3 2002/10/30 23:55:27 brad Exp $
  
  LIB=	png
  SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
-@@ -18,6 +20,7 @@ HDRS=	png.h pngconf.h
+@@ -18,17 +21,30 @@ HDRS=	png.h pngconf.h
  
  CFLAGS+= -Wall
  CPPFLAGS+= -I${.CURDIR} -DPNG_NO_ASSEMBLER_CODE -DPNG_USE_PNGGCCRD
@@ -29,7 +30,32 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.3 2002/10/30 23:55:27 brad Exp $
  
  NOPROFILE= Yes
  
-@@ -37,8 +40,8 @@ test:	pngtest
+-CLEANFILES+= pngtest.o pngtest
++CLEANFILES+= pngtest.o pngtest libpng-config
+ 
+ MAN=	libpng.3 libpngpf.3 png.5
+-DOCS=	ANNOUNCE CHANGES LICENSE README libpng.txt
++DOCS=	README libpng.txt
++
++all: ${_LIBS} libpng-config
+ 
+ pngtest.o:	pngtest.c
+ 	${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
+ 
++libpng-config:
++	( cat scripts/libpng-config-head.in; \
++	echo prefix=\"$(PREFIX)\"; \
++	echo I_opts=\"-I$(INCDIR)\"; \
++	echo L_opts=\"-L$(LIBDIR)\"; \
++	echo R_opts=\"-Wl,-rpath,$(LIBDIR)\"; \
++	echo libs=\"-lpng -lz -lm\"; \
++	cat scripts/libpng-config-body.in ) > libpng-config
++	chmod +x libpng-config
++
+ pngtest:	pngtest.o
+ 	${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm
+ 
+@@ -37,8 +53,8 @@ test:	pngtest
  		LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest
  
  beforeinstall:
@@ -40,7 +66,7 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.3 2002/10/30 23:55:27 brad Exp $
  	fi
  	if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
  	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
-@@ -52,21 +55,17 @@ beforeinstall:
+@@ -52,21 +68,19 @@ beforeinstall:
  	if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
  	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
  	fi
@@ -56,12 +82,14 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.3 2002/10/30 23:55:27 brad Exp $
 -	@rm -f ${DESTDIR}${PREFIX}/include/png.h
 -	@rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
  	@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
++	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
++		-m ${BINMODE} libpng-config ${DESTDIR}${BINDIR}
  	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
 -		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng
+-	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
+-		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
 +		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${INCDIR}
  	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
--		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
--	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
 -		-m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png
 +		-m ${NONBINMODE} ${DOCS} ${DESTDIR}${DOCDIR}
  
diff --git a/graphics/png/pkg/PLIST b/graphics/png/pkg/PLIST
index 8bfbe61aa88..1ba6c6a6647 100644
--- a/graphics/png/pkg/PLIST
+++ b/graphics/png/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.14 2002/07/17 22:39:03 brad Exp $
+@comment $OpenBSD: PLIST,v 1.15 2003/01/25 05:52:21 brad Exp $
+bin/libpng-config
 include/libpng/png.h
 include/libpng/pngconf.h
 lib/libpng.a
@@ -6,9 +7,6 @@ lib/libpng.a
 man/cat3/libpng.0
 man/cat3/libpngpf.0
 man/cat5/png.0
-share/doc/png/ANNOUNCE
-share/doc/png/CHANGES
-share/doc/png/LICENSE
 share/doc/png/README
 share/doc/png/libpng.txt
 @dirrm share/doc/png