diff --git a/x11/gtk+2/Makefile b/x11/gtk+2/Makefile
index bb46d9d8db6..2e244088a57 100644
--- a/x11/gtk+2/Makefile
+++ b/x11/gtk+2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.129 2011/05/11 08:03:21 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.130 2011/05/19 14:30:39 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -13,7 +13,7 @@ PKGNAME-main=	gtk+2-${V}
 PKGNAME-docs=	gtk+2-docs-${V}
 PKGNAME-cups=	gtk+2-cups-${V}
 
-REVISION-main=	2
+REVISION-main=	3
 
 CATEGORIES=	x11 devel
 
diff --git a/x11/gtk+2/pkg/PLIST-main b/x11/gtk+2/pkg/PLIST-main
index 7421efebaa9..121e1d35af0 100644
--- a/x11/gtk+2/pkg/PLIST-main
+++ b/x11/gtk+2/pkg/PLIST-main
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST-main,v 1.24 2011/05/11 08:03:21 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.25 2011/05/19 14:30:39 ajacoutot Exp $
 @conflict gail-*
 @pkgpath x11/gtk+2
+@unexec-delete rm -f ${SYSCONFDIR}/gtk-2.0/gtk.immodules
 bin/gtk-builder-convert
 @bin bin/gtk-demo
 @bin bin/gtk-query-immodules-2.0
@@ -633,5 +634,4 @@ share/themes/Raleigh/gtk-2.0/
 share/themes/Raleigh/gtk-2.0/gtkrc
 @sample ${SYSCONFDIR}/gtk-2.0/
 @exec %D/bin/gtk-query-immodules-2.0 > ${SYSCONFDIR}/gtk-2.0/gtk.immodules
-@extra ${SYSCONFDIR}/gtk-2.0/gtk.immodules
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
diff --git a/x11/gtk+3/Makefile b/x11/gtk+3/Makefile
index 26ecc3fae04..eb0c36ad890 100644
--- a/x11/gtk+3/Makefile
+++ b/x11/gtk+3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/05/11 08:03:21 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2011/05/19 14:30:39 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -13,7 +13,7 @@ PKGNAME-main=	gtk+3-${V}
 PKGNAME-docs=	gtk+3-docs-${V}
 PKGNAME-cups=	gtk+3-cups-${V}
 
-REVISION-main=	0
+REVISION-main=	1
 
 CATEGORIES=	x11 devel
 
diff --git a/x11/gtk+3/pkg/PLIST-main b/x11/gtk+3/pkg/PLIST-main
index 5c80470ce8d..47e3ce0cf8a 100644
--- a/x11/gtk+3/pkg/PLIST-main
+++ b/x11/gtk+3/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2011/05/11 08:03:21 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2011/05/19 14:30:39 ajacoutot Exp $
+@unexec-delete rm -f ${SYSCONFDIR}/gtk-3.0/gtk.immodules
 @bin bin/gtk-query-immodules-3.0
 @bin bin/gtk3-demo
 include/gail-3.0/
@@ -639,5 +640,4 @@ share/themes/Raleigh/gtk-3.0/gtk.css
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
 @exec %D/bin/gtk-query-immodules-3.0 > ${SYSCONFDIR}/gtk-3.0/gtk.immodules
-@extra ${SYSCONFDIR}/gtk-3.0/gtk.immodules
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true