diff --git a/devel/sdl-image/Makefile b/devel/sdl-image/Makefile
index 0ef4ff43db8..e1655a19550 100644
--- a/devel/sdl-image/Makefile
+++ b/devel/sdl-image/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2001/12/28 22:21:29 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.8 2002/05/26 17:40:40 brad Exp $
 
 COMMENT=	"SDL image library"
 
@@ -7,7 +7,7 @@ PROJ=		SDL_image
 DISTNAME=	${PROJ}-${VER}
 PKGNAME=	sdl-image-${VER}
 CATEGORIES=	devel graphics
-NEED_VERSION=	1.500
+NEED_VERSION=	1.525
 MASTER_SITES=	http://www.libsdl.org/projects/${PROJ}/release/
 
 HOMEPAGE=	http://www.libsdl.org/
@@ -28,7 +28,8 @@ USE_X11=	Yes
 
 SEPARATE_BUILD=		concurrent
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+= 	LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
+CONFIGURE_ENV+= 	CPPFLAGS="-I${LOCALBASE}/include/libpng" \
+			LDFLAGS="-L${X11BASE}/lib"
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 
 PATCH_LIST=	${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index 737d7f2f7af..a022b38e238 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2001/05/24 02:27:31 kevlo Exp $
+# $OpenBSD: Makefile,v 1.29 2002/05/26 17:32:57 brad Exp $
 
 COMMENT=	"converts GIF images to the PNG format"
 
@@ -21,7 +21,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--with-png-inc="${LOCALBASE}/include" \
+CONFIGURE_ARGS=	--with-png-inc="${LOCALBASE}/include/libpng" \
 		--with-png-lib="${LOCALBASE}/lib"
 
 
diff --git a/graphics/tiff2png/Makefile b/graphics/tiff2png/Makefile
index fb873e6d113..532b9a66cc5 100644
--- a/graphics/tiff2png/Makefile
+++ b/graphics/tiff2png/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2002/03/03 02:42:34 brad Exp $
+# $OpenBSD: Makefile,v 1.6 2002/05/26 17:35:53 brad Exp $
 
 COMMENT=	"converts TIFF images to PNG format"
 
 DISTNAME=	tiff2png-0.81c
 CATEGORIES=	graphics
-NEED_VERSION=	1.500
+NEED_VERSION=	1.525
 MASTER_SITES=	ftp://swrinde.nde.swri.edu/pub/png/applications/
 
 HOMEPAGE=	http://www.libpng.org/pub/png/apps/tiff2png.html
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MAKE_FLAGS=	CC="${CC}" OPTIMFLAGS="${CFLAGS}" DEBUGFLAGS="-Wall -W" \
-		CFLAGS='$$(TIFF_VERSION) -DFAXPECT $$(MIN_INVERT) $$(OPTIMFLAGS) $$(DEBUGFLAGS) -I${LOCALBASE}/include' \
+		CFLAGS='$$(TIFF_VERSION) -DFAXPECT $$(MIN_INVERT) $$(OPTIMFLAGS) $$(DEBUGFLAGS) -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include' \
 		LDFLAGS="-L${LOCALBASE}/lib -lpng -lz -ltiff -ljpeg -lm"
 
 MAKE_FILE=	Makefile.unx