diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index d161e98f1a5..6b204d03f93 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2001/09/01 02:33:59 brad Exp $
+# $OpenBSD: Makefile,v 1.6 2001/09/13 20:35:34 todd Exp $
 
 COMMENT=	"replacement library for Imlib"
 
@@ -14,6 +14,9 @@ LIB_DEPENDS=	png.2::graphics/png \
 		tiff.35.::graphics/tiff \
 		gtk.1.2::x11/gtk+
 
+FLAVORS=	gnome
+FLAVOR?=	
+
 MAINTAINER=	Tom Knienieder <tom@knienieder.com>
 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -27,6 +30,17 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static --disable-modules
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.if ${FLAVOR:L:Mgnome}
+LIB_DEPENDS+=	gnome.36::x11/gnome/libs
+.endif 
+
+FLAVORS= gnome
+FLAVOR?=
+
+.if ${FLAVOR:L} == "gnome"
+CONFIGURE_ARGS+= --with-gnome
+.endif
+
 pre-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs perl -pi -e \
 		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
diff --git a/graphics/gdk-pixbuf/pkg/PFRAG.gnome b/graphics/gdk-pixbuf/pkg/PFRAG.gnome
new file mode 100644
index 00000000000..7f0335c5a4a
--- /dev/null
+++ b/graphics/gdk-pixbuf/pkg/PFRAG.gnome
@@ -0,0 +1,5 @@
+@comment $OpenBSD: PFRAG.gnome,v 1.1 2001/09/13 20:35:34 todd Exp $
+include/gdk-pixbuf/gnome-canvas-pixbuf.h
+lib/libgnomecanvaspixbuf.a
+lib/libgnomecanvaspixbuf.la
+lib/libgnomecanvaspixbuf.so.1.0
diff --git a/graphics/gdk-pixbuf/pkg/PFRAG.shared b/graphics/gdk-pixbuf/pkg/PFRAG.shared
index 8e086b1d70e..d8ee8d015c3 100644
--- a/graphics/gdk-pixbuf/pkg/PFRAG.shared
+++ b/graphics/gdk-pixbuf/pkg/PFRAG.shared
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2001/03/27 11:45:12 naddy Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2001/09/13 20:35:34 todd Exp $
 lib/libgdk_pixbuf.so.2.0
 lib/libgdk_pixbuf_xlib.so.2.0
-DYNLIBDIR(%B)
+lib/libgnomecanvaspixbuf.so.1.0
+DYNLIBDIR(%D/lib)
diff --git a/graphics/gdk-pixbuf/pkg/PLIST b/graphics/gdk-pixbuf/pkg/PLIST
index 95369c010aa..f0473cd9326 100644
--- a/graphics/gdk-pixbuf/pkg/PLIST
+++ b/graphics/gdk-pixbuf/pkg/PLIST
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.5 2001/04/18 11:19:49 reinhard Exp $
+@comment $OpenBSD: PLIST,v 1.6 2001/09/13 20:35:34 todd Exp $
 bin/gdk-pixbuf-config
 include/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf/gdk-pixbuf-loader.h
 include/gdk-pixbuf/gdk-pixbuf-xlib.h
 include/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
 include/gdk-pixbuf/gdk-pixbuf.h
+include/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gdk_pixbufConf.sh
 lib/gdk_pixbuf_xlibConf.sh
 lib/gnomecanvaspixbufConf.sh
@@ -12,7 +13,8 @@ lib/libgdk_pixbuf.a
 lib/libgdk_pixbuf.la
 lib/libgdk_pixbuf_xlib.a
 lib/libgdk_pixbuf_xlib.la
-%%SHARED%%
+lib/libgnomecanvaspixbuf.a
+lib/libgnomecanvaspixbuf.la
 share/aclocal/gdk-pixbuf.m4
 share/html/gdk-pixbuf-decl.txt
 share/html/gdk-pixbuf-sections.txt
@@ -56,6 +58,12 @@ share/html/gdk-pixbuf/x3723.html
 share/html/gdk-pixbuf/x3735.html
 share/html/gdk-pixbuf/x3765.html
 share/html/gdk-pixbuf/x3787.html
+%%gnome%%
+%%SHARED%%
 @dirrm share/html/gdk-pixbuf
 @dirrm share/html
+@dirrm share/aclocal
+@exec mkdir -p %D/lib/gdk-pixbuf/loaders
+@dirrm lib/gdk-pixbuf/loaders
+@dirrm lib/gdk-pixbuf
 @dirrm include/gdk-pixbuf