diff --git a/x11/gnome/librsvg/Makefile b/x11/gnome/librsvg/Makefile
index bed8ff9b5bd..f9d12846615 100644
--- a/x11/gnome/librsvg/Makefile
+++ b/x11/gnome/librsvg/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.60 2011/04/04 06:26:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.61 2011/04/05 14:42:04 ajacoutot Exp $
 
 COMMENT=	SAX-based render library for SVG files
 
 GNOME_PROJECT=	librsvg
 GNOME_VERSION=	2.34.0
 
+REVISION=	0
+
 SHARED_LIBS +=	rsvg-2         28.0           # .34.0
 
 CATEGORIES=	devel
@@ -15,27 +17,26 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 croco-0.6
-WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xml2 z
-WANTLIB += xcb-render gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gtk-x11-2.0 GL Xxf86vm drm xcb-shm
+WANTLIB += GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm
+WANTLIB += c cairo croco-0.6 drm expat fontconfig freetype gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm xml2
+WANTLIB += z
 
 MODULES=	devel/gettext \
 		x11/gnome \
 		lang/python
 
-LIB_DEPENDS=	x11/gtk+2 \
+LIB_DEPENDS=	graphics/gdk-pixbuf2 \
+		devel/pango \
 		www/libcroco
-RUN_DEPENDS=	x11/gtk-engines2
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-gtk-doc \
-		--enable-gtk-theme \
+		--disable-gtk-theme \
 		--with-svgz \
 		--with-croco
 
diff --git a/x11/gnome/librsvg/patches/patch-configure b/x11/gnome/librsvg/patches/patch-configure
deleted file mode 100644
index 0c35c798f28..00000000000
--- a/x11/gnome/librsvg/patches/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configure,v 1.10 2011/04/04 06:26:03 ajacoutot Exp $
---- configure.orig	Mon Apr  4 08:08:14 2011
-+++ configure	Mon Apr  4 08:09:08 2011
-@@ -13014,7 +13014,8 @@ fi
-   fi
- fi
- 
--
-+# XXX force disable gtk+3
-+have_gtk_3=no
- 
- 
-  if test "$enable_gtk_theme" = "yes"; then
diff --git a/x11/gnome/librsvg/pkg/PLIST b/x11/gnome/librsvg/pkg/PLIST
index 002ef357f42..2ac17f12628 100644
--- a/x11/gnome/librsvg/pkg/PLIST
+++ b/x11/gnome/librsvg/pkg/PLIST
@@ -1,7 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.22 2010/09/30 07:23:47 ajacoutot Exp $
-bin/rsvg
+@comment $OpenBSD: PLIST,v 1.23 2011/04/05 14:42:04 ajacoutot Exp $
 @bin bin/rsvg-convert
-@bin bin/rsvg-view
 include/librsvg-2.0/
 include/librsvg-2.0/librsvg/
 include/librsvg-2.0/librsvg/librsvg-enum-types.h
@@ -11,16 +9,10 @@ include/librsvg-2.0/librsvg/rsvg.h
 @comment lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.a
 @comment lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so
-@comment lib/gtk-2.0/2.10.0/engines/libsvg.a
-@comment lib/gtk-2.0/2.10.0/engines/libsvg.la
-lib/gtk-2.0/2.10.0/engines/libsvg.so
-@comment lib/gtk-3.0/
-@comment lib/gtk-3.0/engines/
 lib/librsvg-2.a
 lib/librsvg-2.la
 @lib lib/librsvg-2.so.${LIBrsvg-2_VERSION}
 lib/pkgconfig/librsvg-2.0.pc
-@man man/man1/rsvg.1
 share/gtk-doc/html/rsvg-2.0/
 share/gtk-doc/html/rsvg-2.0/RsvgHandle.html
 share/gtk-doc/html/rsvg-2.0/annotation-glossary.html
@@ -50,14 +42,5 @@ share/gtk-doc/html/rsvg-2.0/style.css
 share/gtk-doc/html/rsvg-2.0/up.png
 share/pixmaps/
 share/pixmaps/svg-viewer.svg
-share/themes/bubble/
-share/themes/bubble/gtk-2.0/
-share/themes/bubble/gtk-2.0/blue.svg
-share/themes/bubble/gtk-2.0/green.svg
-share/themes/bubble/gtk-2.0/gtkrc
-share/themes/bubble/gtk-2.0/orange.svg
-share/themes/bubble/gtk-2.0/purple.svg
-share/themes/bubble/gtk-2.0/red.svg
-@comment share/themes/bubble/gtk-3.0/
 @exec %D/bin/gdk-pixbuf-query-loaders --update-cache
 @unexec-delete %D/bin/gdk-pixbuf-query-loaders --update-cache