diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 07724a0e553..ea91ee14674 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.53 2005/10/30 00:10:41 fgsch Exp $
+# $OpenBSD: Makefile,v 1.54 2005/12/26 22:33:17 steven Exp $
 
 COMMENT=	"library for manipulating PNG images"
 
 DISTNAME=	libpng-1.2.8
 PKGNAME=	${DISTNAME:S/lib//}
+SHARED_LIBS=	png	4.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/}
 
@@ -15,9 +16,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE_FLAGS=	DESTDIR="${WRKINST}" PREFIX="${PREFIX}"
+FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR="${WRKINST}" PREFIX="${PREFIX}"
 
 MAKE_ENV=	CC="${CC}"
 MAKE_FILE=	scripts/makefile.openbsd
+MAKE_FLAGS=	SHLIB_MAJOR=${LIBpng_VERSION:R} \
+		SHLIB_MINOR=${LIBpng_VERSION:E}
 
 .include <bsd.port.mk>
diff --git a/graphics/png/patches/patch-scripts_makefile_openbsd b/graphics/png/patches/patch-scripts_makefile_openbsd
index a6a298f00cd..0ad07e0f0b4 100644
--- a/graphics/png/patches/patch-scripts_makefile_openbsd
+++ b/graphics/png/patches/patch-scripts_makefile_openbsd
@@ -1,6 +1,6 @@
---- scripts/makefile.openbsd.orig	Thu Dec  2 19:14:31 2004
-+++ scripts/makefile.openbsd	Sun Jul 24 00:55:05 2005
-@@ -1,13 +1,16 @@
+--- scripts/makefile.openbsd.orig	Fri Dec  3 01:14:31 2004
++++ scripts/makefile.openbsd	Mon Dec 26 22:46:14 2005
+@@ -1,14 +1,14 @@
 -# makefile for libpng
 +# makefile for libpng under OpenBSD
  # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
@@ -16,12 +16,11 @@
  
 -SHLIB_MAJOR=	0
 -SHLIB_MINOR=	1.2.8
-+SHLIB_MAJOR=	4
-+SHLIB_MINOR=	2
- 
+-
  LIB=	png
  SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
-@@ -21,24 +24,39 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_ASSEMBL
+ 	pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \
+@@ -21,24 +21,39 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_ASSEMBL
  
  NOPROFILE= Yes
  
@@ -68,7 +67,7 @@
  	fi
  	if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
  	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
-@@ -52,21 +70,24 @@ beforeinstall:
+@@ -52,21 +67,24 @@ beforeinstall:
  	if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
  	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
  	fi
diff --git a/graphics/png/pkg/PFRAG.shared b/graphics/png/pkg/PFRAG.shared
index 842b7f3b3d4..20414254298 100644
--- a/graphics/png/pkg/PFRAG.shared
+++ b/graphics/png/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.14 2005/07/24 04:55:35 brad Exp $
-@lib lib/libpng.so.4.2
+@comment $OpenBSD: PFRAG.shared,v 1.15 2005/12/26 22:33:17 steven Exp $
+@lib lib/libpng.so.${LIBpng_VERSION}