diff --git a/x11/gnome/librsvg/Makefile b/x11/gnome/librsvg/Makefile
index 687c83d4986..331b5a63768 100644
--- a/x11/gnome/librsvg/Makefile
+++ b/x11/gnome/librsvg/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2005/05/26 03:39:31 marcm Exp $
+# $OpenBSD: Makefile,v 1.14 2005/05/28 00:01:30 marcm Exp $
 
 COMMENT=		"SAX-based render library for SVG files"
 
 VERSION=		2.9.5
 DISTNAME=		librsvg-${VERSION}
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		devel x11/gnome
 
 HOMEPAGE=		http://www.gnome.org
@@ -41,6 +42,8 @@ CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	--disable-gtk-doc
 CONFIGURE_ARGS+= 	--with-svgz
 CONFIGURE_ARGS+= 	--without-croco
+# Crap, the loader breaks with new ld.so
+CONFIGURE_ARGS+=	--disable-pixbuf-loader
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/x11/gnome/librsvg/pkg/PFRAG.shared b/x11/gnome/librsvg/pkg/PFRAG.shared
index f931e38b037..f3369da59aa 100644
--- a/x11/gnome/librsvg/pkg/PFRAG.shared
+++ b/x11/gnome/librsvg/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.9 2005/05/26 03:39:31 marcm Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.10 2005/05/28 00:01:31 marcm Exp $
 lib/gtk-2.0/2.4.0/engines/libsvg.so
-lib/gtk-2.0/2.4.0/loaders/svg_loader.so
 @lib lib/librsvg-2.so.11.5
+lib/mozilla/plugins/libmozsvgdec.so
diff --git a/x11/gnome/librsvg/pkg/PLIST b/x11/gnome/librsvg/pkg/PLIST
index de5218cccc9..5d7c5397bda 100644
--- a/x11/gnome/librsvg/pkg/PLIST
+++ b/x11/gnome/librsvg/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2005/05/26 03:39:31 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.12 2005/05/28 00:01:31 marcm Exp $
 %%SHARED%%
 bin/rsvg
 bin/rsvg-view
@@ -14,12 +14,12 @@ lib/gtk-2.0/2.4.0/engines/
 lib/gtk-2.0/2.4.0/engines/libsvg.a
 lib/gtk-2.0/2.4.0/engines/libsvg.la
 lib/gtk-2.0/2.4.0/loaders/
-lib/gtk-2.0/2.4.0/loaders/svg_loader.a
-lib/gtk-2.0/2.4.0/loaders/svg_loader.la
 lib/librsvg-2.a
 lib/librsvg-2.la
 lib/mozilla/
 lib/mozilla/plugins/
+lib/mozilla/plugins/libmozsvgdec.a
+lib/mozilla/plugins/libmozsvgdec.la
 lib/pkgconfig/
 lib/pkgconfig/librsvg-2.0.pc
 @man man/man1/rsvg.1
@@ -43,5 +43,5 @@ share/gtk-doc/html/rsvg/rsvg.html
 share/gtk-doc/html/rsvg/up.png
 share/pixmaps/
 share/pixmaps/svg-viewer.svg
-@exec %D/bin/gdk-pixbuf-query-loaders > /var/db/gtk-2.0/gdk-pixbuf.loaders
-@unexec %D/bin/gdk-pixbuf-query-loaders > /var/db/gtk-2.0/gdk-pixbuf.loaders
+@comment @exec %D/bin/gdk-pixbuf-query-loaders > /var/db/gtk-2.0/gdk-pixbuf.loaders
+@comment @unexec %D/bin/gdk-pixbuf-query-loaders > /var/db/gtk-2.0/gdk-pixbuf.loaders