diff --git a/srcpkgs/GConf/gir-gconf.template b/srcpkgs/GConf/gir-gconf.template
deleted file mode 100644
index 9986915334..0000000000
--- a/srcpkgs/GConf/gir-gconf.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gconf'.
-#
-short_desc="Introspection data for GNOME GConf"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- GConf libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 28be359ba6..8e434ac8d3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -14,7 +14,7 @@ long_desc="
 
 triggers="gio-modules"
 conf_files="/etc/gconf/2/path"
-subpackages="gir-gconf $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/accountsservice/gir-accountsservice.template b/srcpkgs/accountsservice/gir-accountsservice.template
deleted file mode 100644
index dae08e8fb8..0000000000
--- a/srcpkgs/accountsservice/gir-accountsservice.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-accountsservice'.
-#
-short_desc="Introspection data for AccountsService"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- AccountsService library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index 5e33f81392..be4bba141c 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -11,7 +11,7 @@ long_desc="
  querying and manipulating user account information and an implementation
  of these interfaces, based on the useradd, usermod and userdel commands."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency run dbus-libs
diff --git a/srcpkgs/atk/gir-atk.template b/srcpkgs/atk/gir-atk.template
deleted file mode 100644
index 81d67b2412..0000000000
--- a/srcpkgs/atk/gir-atk.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-atk'.
-#
-short_desc="Introspection data for ATK"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the ATK library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index 4bdc8c6e2c..a4899fc6e3 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -18,7 +18,7 @@ long_desc="
  It also provides interfaces which an application can use to provide
  additional accessibility information to assistive technology tools."
 
-subpackages="gir-atk atk-devel"
+subpackages="atk-devel"
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency build pkg-config
diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template
index 1452d3219d..a248a1ba68 100644
--- a/srcpkgs/avahi/avahi-glib-libs.template
+++ b/srcpkgs/avahi/avahi-glib-libs.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the glib shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
@@ -17,4 +19,5 @@ do_install()
 
 	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-glib.so* ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-gobject.so* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/avahi/gir-avahi.template b/srcpkgs/avahi/gir-avahi.template
deleted file mode 100644
index f0fdae33a0..0000000000
--- a/srcpkgs/avahi/gir-avahi.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-avahi'.
-#
-short_desc="Introspection data for Avahi"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for Avahi."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 6b3e1ae93c..339ab92711 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -31,7 +31,7 @@ subpackages="$subpackages $pkgname-glib-libs-devel $pkgname-ui-libs"
 subpackages="$subpackages $pkgname-ui-libs-gtk3"
 subpackages="$subpackages $pkgname-ui-libs-devel $pkgname-utils"
 subpackages="$subpackages $pkgname-ui-utils $pkgname-python-utils"
-subpackages="$subpackages $pkgname-python gir-$pkgname"
+subpackages="$subpackages $pkgname-python"
 
 Add_dependency run glibc
 Add_dependency run dbus
diff --git a/srcpkgs/babl/gir-babl.template b/srcpkgs/babl/gir-babl.template
deleted file mode 100644
index 2e6c73b8b9..0000000000
--- a/srcpkgs/babl/gir-babl.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-babl'.
-#
-short_desc="Introspection data for BABL"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the Babl library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 22d52187ea..0cb38dbbd8 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,6 +1,7 @@
 # Template build file for 'babl'.
 pkgname=babl
 version=0.1.4
+revision=1
 distfiles="ftp://ftp.gimp.org/pub/babl/0.1/babl-${version}.tar.bz2"
 build_style=gnu_configure
 short_desc="Dynamic pixel format translation library"
@@ -16,6 +17,6 @@ long_desc="
  A vocabulary to formulate new pixel formats from existing primitives is
  provided as well as the framework to add new color models and data types."
 
-subpackages="gir-babl babl-devel"
+subpackages="babl-devel"
 Add_dependency run glibc
 Add_dependency build gobject-introspection
diff --git a/srcpkgs/brasero/gir-brasero.template b/srcpkgs/brasero/gir-brasero.template
deleted file mode 100644
index c6820bec9c..0000000000
--- a/srcpkgs/brasero/gir-brasero.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gir-brasero'.
-#
-short_desc="Brasero introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of Brasero in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index ac6a2b6ba5..e6ec41ca29 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -21,7 +21,7 @@ long_desc="
 
  And much more..."
 
-subpackages="$pkgname-devel gir-$pkgname"
+subpackages="$pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 triggers="mimedb gsettings-schemas"
 
diff --git a/srcpkgs/clutter-gtk/gir-clutter-gtk.template b/srcpkgs/clutter-gtk/gir-clutter-gtk.template
deleted file mode 100644
index 00798afc6a..0000000000
--- a/srcpkgs/clutter-gtk/gir-clutter-gtk.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-clutter-gtk'.
-#
-short_desc="Introspection data for GTK+ bindings for Clutter"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GTK+
- bindings for the Clutter Toolkit."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template
index cf54cd71e5..373fbd4849 100644
--- a/srcpkgs/clutter-gtk/template
+++ b/srcpkgs/clutter-gtk/template
@@ -10,7 +10,7 @@ checksum=1516ac98b9f0436d7806f02153810fae31f961446311e06805f574ac1aaa969e
 long_desc="
  This packages contains the GTK+3 bindings for the Clutter Toolkit."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run json-glib
diff --git a/srcpkgs/clutter/gir-clutter.template b/srcpkgs/clutter/gir-clutter.template
deleted file mode 100644
index 8e563de0b2..0000000000
--- a/srcpkgs/clutter/gir-clutter.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-clutter'.
-#
-short_desc="Clutter introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of Clutter in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run clutter
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template
index 9edfffa2e3..da0c3b10d4 100644
--- a/srcpkgs/clutter/template
+++ b/srcpkgs/clutter/template
@@ -1,6 +1,7 @@
 # Template file for 'clutter'
 pkgname=clutter
 version=1.6.6
+revision=1
 distfiles="http://www.clutter-project.org/sources/clutter/1.6/clutter-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-x --with-flavour=glx --with-imagebackend=gdk-pixbuf
@@ -12,7 +13,7 @@ long_desc="
  Clutter is an open source software library for creating fast, visually
  rich and animated graphical user interfaces."
 
-subpackages="gir-clutter clutter-devel"
+subpackages="clutter-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/eog/gir-eog.template b/srcpkgs/eog/gir-eog.template
deleted file mode 100644
index 6783daccfa..0000000000
--- a/srcpkgs/eog/gir-eog.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-eog'.
-#
-short_desc="Introspection data for the Eye Of the Gnome."
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- Eye Of the Gnome library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/eog/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 75d75385a8..f1ac24ff1e 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -15,7 +15,7 @@ long_desc="
 
 triggers="gsettings-schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="gir-eog eog-devel"
+subpackages="eog-devel"
 
 Add_dependency run glibc
 Add_dependency run gnome-desktop
diff --git a/srcpkgs/epiphany/gir-epiphany.template b/srcpkgs/epiphany/gir-epiphany.template
deleted file mode 100644
index ceae4059ea..0000000000
--- a/srcpkgs/epiphany/gir-epiphany.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-epiphany'.
-#
-short_desc="Introspection data for GNOME Epiphany"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- Epiphany library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 47ea4c7ae4..f7e582ee6c 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -20,7 +20,7 @@ long_desc="
 
 triggers="gsettings-schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 # XXX: enable --with-ca-file.
 
diff --git a/srcpkgs/evolution-data-server/gir-evolution-data-server.template b/srcpkgs/evolution-data-server/gir-evolution-data-server.template
deleted file mode 100644
index bfbbeb19cb..0000000000
--- a/srcpkgs/evolution-data-server/gir-evolution-data-server.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-evolution-data-server'.
-#
-short_desc="Introspection data for EDS"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- Evolution Data Server libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 6d56618b8e..03b8bbd19f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -16,7 +16,7 @@ long_desc="
  Evolution Data Server is responsible for managing calendar and addressbook
  information within the GNOME desktop."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run zlib
diff --git a/srcpkgs/gdk-pixbuf/gir-gdk-pixbuf.template b/srcpkgs/gdk-pixbuf/gir-gdk-pixbuf.template
deleted file mode 100644
index 66422ab860..0000000000
--- a/srcpkgs/gdk-pixbuf/gir-gdk-pixbuf.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gdk-pixbuf'.
-#
-short_desc="Introspection data for GdkPixbuf"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GDK
- pixbuf library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 8f7a80c6b9..749d4b225a 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -13,7 +13,7 @@ long_desc="
 # gtk+<2.22 included gdk-pixbuf.
 replaces="gtk+<2.22"
 triggers="gtk-pixbuf-loaders"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
@@ -21,6 +21,7 @@ Add_dependency run libpng
 Add_dependency run jpeg
 Add_dependency run tiff
 Add_dependency run libX11
+
 Add_dependency build perl
 Add_dependency build pkg-config
 Add_dependency build glib-devel
diff --git a/srcpkgs/gedit/gir-gedit.template b/srcpkgs/gedit/gir-gedit.template
deleted file mode 100644
index 69990ffdaa..0000000000
--- a/srcpkgs/gedit/gir-gedit.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gedit'.
-#
-short_desc="Introspection data for Gedit"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- Gnome Editor."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/gedit/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index e07f2b7db6..5c222240ff 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -12,7 +12,7 @@ long_desc="
 
 triggers="gsettings-schemas" 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="gir-gedit gedit-devel"
+subpackages="gedit-devel"
 
 Add_dependency run glibc
 Add_dependency run libxml2
diff --git a/srcpkgs/gir-accountsservice b/srcpkgs/gir-accountsservice
deleted file mode 120000
index 345043b0d5..0000000000
--- a/srcpkgs/gir-accountsservice
+++ /dev/null
@@ -1 +0,0 @@
-accountsservice
\ No newline at end of file
diff --git a/srcpkgs/gir-atk b/srcpkgs/gir-atk
deleted file mode 120000
index b9b776926f..0000000000
--- a/srcpkgs/gir-atk
+++ /dev/null
@@ -1 +0,0 @@
-atk
\ No newline at end of file
diff --git a/srcpkgs/gir-avahi b/srcpkgs/gir-avahi
deleted file mode 120000
index 3d497a7274..0000000000
--- a/srcpkgs/gir-avahi
+++ /dev/null
@@ -1 +0,0 @@
-avahi
\ No newline at end of file
diff --git a/srcpkgs/gir-babl b/srcpkgs/gir-babl
deleted file mode 120000
index 61658c2bee..0000000000
--- a/srcpkgs/gir-babl
+++ /dev/null
@@ -1 +0,0 @@
-babl
\ No newline at end of file
diff --git a/srcpkgs/gir-brasero b/srcpkgs/gir-brasero
deleted file mode 120000
index 42b30b682d..0000000000
--- a/srcpkgs/gir-brasero
+++ /dev/null
@@ -1 +0,0 @@
-brasero
\ No newline at end of file
diff --git a/srcpkgs/gir-clutter b/srcpkgs/gir-clutter
deleted file mode 120000
index 5a89e25ad7..0000000000
--- a/srcpkgs/gir-clutter
+++ /dev/null
@@ -1 +0,0 @@
-clutter
\ No newline at end of file
diff --git a/srcpkgs/gir-clutter-gtk b/srcpkgs/gir-clutter-gtk
deleted file mode 120000
index e4c7380ff0..0000000000
--- a/srcpkgs/gir-clutter-gtk
+++ /dev/null
@@ -1 +0,0 @@
-clutter-gtk
\ No newline at end of file
diff --git a/srcpkgs/gir-eog b/srcpkgs/gir-eog
deleted file mode 120000
index 08e89b6063..0000000000
--- a/srcpkgs/gir-eog
+++ /dev/null
@@ -1 +0,0 @@
-eog
\ No newline at end of file
diff --git a/srcpkgs/gir-epiphany b/srcpkgs/gir-epiphany
deleted file mode 120000
index ba4f157dc2..0000000000
--- a/srcpkgs/gir-epiphany
+++ /dev/null
@@ -1 +0,0 @@
-epiphany
\ No newline at end of file
diff --git a/srcpkgs/gir-evolution-data-server b/srcpkgs/gir-evolution-data-server
deleted file mode 120000
index 5d0d6efe0d..0000000000
--- a/srcpkgs/gir-evolution-data-server
+++ /dev/null
@@ -1 +0,0 @@
-evolution-data-server
\ No newline at end of file
diff --git a/srcpkgs/gir-gconf b/srcpkgs/gir-gconf
deleted file mode 120000
index cf3c511e78..0000000000
--- a/srcpkgs/gir-gconf
+++ /dev/null
@@ -1 +0,0 @@
-GConf
\ No newline at end of file
diff --git a/srcpkgs/gir-gdata b/srcpkgs/gir-gdata
deleted file mode 120000
index 29d228b2d7..0000000000
--- a/srcpkgs/gir-gdata
+++ /dev/null
@@ -1 +0,0 @@
-libgdata
\ No newline at end of file
diff --git a/srcpkgs/gir-gdk-pixbuf b/srcpkgs/gir-gdk-pixbuf
deleted file mode 120000
index fa20dc708a..0000000000
--- a/srcpkgs/gir-gdk-pixbuf
+++ /dev/null
@@ -1 +0,0 @@
-gdk-pixbuf
\ No newline at end of file
diff --git a/srcpkgs/gir-gedit b/srcpkgs/gir-gedit
deleted file mode 120000
index a1d833e423..0000000000
--- a/srcpkgs/gir-gedit
+++ /dev/null
@@ -1 +0,0 @@
-gedit
\ No newline at end of file
diff --git a/srcpkgs/gir-gnome-bluetooth b/srcpkgs/gir-gnome-bluetooth
deleted file mode 120000
index 61a242db1c..0000000000
--- a/srcpkgs/gir-gnome-bluetooth
+++ /dev/null
@@ -1 +0,0 @@
-gnome-bluetooth
\ No newline at end of file
diff --git a/srcpkgs/gir-gnome-desktop b/srcpkgs/gir-gnome-desktop
deleted file mode 120000
index 48f6eb8abe..0000000000
--- a/srcpkgs/gir-gnome-desktop
+++ /dev/null
@@ -1 +0,0 @@
-gnome-desktop
\ No newline at end of file
diff --git a/srcpkgs/gir-gnome-menus b/srcpkgs/gir-gnome-menus
deleted file mode 120000
index 6e01dd5b31..0000000000
--- a/srcpkgs/gir-gnome-menus
+++ /dev/null
@@ -1 +0,0 @@
-gnome-menus
\ No newline at end of file
diff --git a/srcpkgs/gir-gnome-panel b/srcpkgs/gir-gnome-panel
deleted file mode 120000
index 50c431b310..0000000000
--- a/srcpkgs/gir-gnome-panel
+++ /dev/null
@@ -1 +0,0 @@
-gnome-panel
\ No newline at end of file
diff --git a/srcpkgs/gir-gnome-shell b/srcpkgs/gir-gnome-shell
deleted file mode 120000
index ad212e6a27..0000000000
--- a/srcpkgs/gir-gnome-shell
+++ /dev/null
@@ -1 +0,0 @@
-gnome-shell
\ No newline at end of file
diff --git a/srcpkgs/gir-gssdp b/srcpkgs/gir-gssdp
deleted file mode 120000
index c0eeeda87f..0000000000
--- a/srcpkgs/gir-gssdp
+++ /dev/null
@@ -1 +0,0 @@
-gssdp
\ No newline at end of file
diff --git a/srcpkgs/gir-gst-plugins-base b/srcpkgs/gir-gst-plugins-base
deleted file mode 120000
index 1f1773adba..0000000000
--- a/srcpkgs/gir-gst-plugins-base
+++ /dev/null
@@ -1 +0,0 @@
-gst-plugins-base
\ No newline at end of file
diff --git a/srcpkgs/gir-gstreamer b/srcpkgs/gir-gstreamer
deleted file mode 120000
index 037f2c4907..0000000000
--- a/srcpkgs/gir-gstreamer
+++ /dev/null
@@ -1 +0,0 @@
-gstreamer
\ No newline at end of file
diff --git a/srcpkgs/gir-gtk+ b/srcpkgs/gir-gtk+
deleted file mode 120000
index 50dbbf5fe7..0000000000
--- a/srcpkgs/gir-gtk+
+++ /dev/null
@@ -1 +0,0 @@
-gtk+
\ No newline at end of file
diff --git a/srcpkgs/gir-gtk+3 b/srcpkgs/gir-gtk+3
deleted file mode 120000
index 6dc54ba385..0000000000
--- a/srcpkgs/gir-gtk+3
+++ /dev/null
@@ -1 +0,0 @@
-gtk+3
\ No newline at end of file
diff --git a/srcpkgs/gir-gtksourceview b/srcpkgs/gir-gtksourceview
deleted file mode 120000
index 4917807f0a..0000000000
--- a/srcpkgs/gir-gtksourceview
+++ /dev/null
@@ -1 +0,0 @@
-gtksourceview
\ No newline at end of file
diff --git a/srcpkgs/gir-gudev b/srcpkgs/gir-gudev
deleted file mode 120000
index b95ad750c4..0000000000
--- a/srcpkgs/gir-gudev
+++ /dev/null
@@ -1 +0,0 @@
-udev
\ No newline at end of file
diff --git a/srcpkgs/gir-gupnp b/srcpkgs/gir-gupnp
deleted file mode 120000
index 6061f46677..0000000000
--- a/srcpkgs/gir-gupnp
+++ /dev/null
@@ -1 +0,0 @@
-gupnp
\ No newline at end of file
diff --git a/srcpkgs/gir-gweather b/srcpkgs/gir-gweather
deleted file mode 120000
index 33c4dea4ae..0000000000
--- a/srcpkgs/gir-gweather
+++ /dev/null
@@ -1 +0,0 @@
-libgweather
\ No newline at end of file
diff --git a/srcpkgs/gir-json-glib b/srcpkgs/gir-json-glib
deleted file mode 120000
index f6ab71b1c5..0000000000
--- a/srcpkgs/gir-json-glib
+++ /dev/null
@@ -1 +0,0 @@
-json-glib
\ No newline at end of file
diff --git a/srcpkgs/gir-libgnomekbd b/srcpkgs/gir-libgnomekbd
deleted file mode 120000
index d8e91fad51..0000000000
--- a/srcpkgs/gir-libgnomekbd
+++ /dev/null
@@ -1 +0,0 @@
-libgnomekbd
\ No newline at end of file
diff --git a/srcpkgs/gir-libsoup b/srcpkgs/gir-libsoup
deleted file mode 120000
index ed1af3c9d3..0000000000
--- a/srcpkgs/gir-libsoup
+++ /dev/null
@@ -1 +0,0 @@
-libsoup
\ No newline at end of file
diff --git a/srcpkgs/gir-libunique b/srcpkgs/gir-libunique
deleted file mode 120000
index a4f4bebbc8..0000000000
--- a/srcpkgs/gir-libunique
+++ /dev/null
@@ -1 +0,0 @@
-libunique
\ No newline at end of file
diff --git a/srcpkgs/gir-libwnck b/srcpkgs/gir-libwnck
deleted file mode 120000
index f1e1ba2a20..0000000000
--- a/srcpkgs/gir-libwnck
+++ /dev/null
@@ -1 +0,0 @@
-libwnck
\ No newline at end of file
diff --git a/srcpkgs/gir-lightdm b/srcpkgs/gir-lightdm
deleted file mode 120000
index af96b29785..0000000000
--- a/srcpkgs/gir-lightdm
+++ /dev/null
@@ -1 +0,0 @@
-lightdm
\ No newline at end of file
diff --git a/srcpkgs/gir-mutter b/srcpkgs/gir-mutter
deleted file mode 120000
index 9c8407d026..0000000000
--- a/srcpkgs/gir-mutter
+++ /dev/null
@@ -1 +0,0 @@
-mutter
\ No newline at end of file
diff --git a/srcpkgs/gir-nautilus b/srcpkgs/gir-nautilus
deleted file mode 120000
index 9f0175d681..0000000000
--- a/srcpkgs/gir-nautilus
+++ /dev/null
@@ -1 +0,0 @@
-nautilus
\ No newline at end of file
diff --git a/srcpkgs/gir-notify b/srcpkgs/gir-notify
deleted file mode 120000
index a0f6bc687b..0000000000
--- a/srcpkgs/gir-notify
+++ /dev/null
@@ -1 +0,0 @@
-libnotify
\ No newline at end of file
diff --git a/srcpkgs/gir-pango b/srcpkgs/gir-pango
deleted file mode 120000
index f23a548cc8..0000000000
--- a/srcpkgs/gir-pango
+++ /dev/null
@@ -1 +0,0 @@
-pango
\ No newline at end of file
diff --git a/srcpkgs/gir-peas b/srcpkgs/gir-peas
deleted file mode 120000
index f72cdee3a8..0000000000
--- a/srcpkgs/gir-peas
+++ /dev/null
@@ -1 +0,0 @@
-libpeas
\ No newline at end of file
diff --git a/srcpkgs/gir-polkit b/srcpkgs/gir-polkit
deleted file mode 120000
index 3b45280441..0000000000
--- a/srcpkgs/gir-polkit
+++ /dev/null
@@ -1 +0,0 @@
-polkit
\ No newline at end of file
diff --git a/srcpkgs/gir-polkit-gnome b/srcpkgs/gir-polkit-gnome
deleted file mode 120000
index ab161b4d14..0000000000
--- a/srcpkgs/gir-polkit-gnome
+++ /dev/null
@@ -1 +0,0 @@
-polkit-gnome
\ No newline at end of file
diff --git a/srcpkgs/gir-seahorse b/srcpkgs/gir-seahorse
deleted file mode 120000
index b9ddbd7d01..0000000000
--- a/srcpkgs/gir-seahorse
+++ /dev/null
@@ -1 +0,0 @@
-seahorse
\ No newline at end of file
diff --git a/srcpkgs/gir-telepathy-glib b/srcpkgs/gir-telepathy-glib
deleted file mode 120000
index 5d4a840a72..0000000000
--- a/srcpkgs/gir-telepathy-glib
+++ /dev/null
@@ -1 +0,0 @@
-telepathy-glib
\ No newline at end of file
diff --git a/srcpkgs/gir-totem b/srcpkgs/gir-totem
deleted file mode 120000
index f252041718..0000000000
--- a/srcpkgs/gir-totem
+++ /dev/null
@@ -1 +0,0 @@
-totem
\ No newline at end of file
diff --git a/srcpkgs/gir-totem-pl-parser b/srcpkgs/gir-totem-pl-parser
deleted file mode 120000
index e94521bbd1..0000000000
--- a/srcpkgs/gir-totem-pl-parser
+++ /dev/null
@@ -1 +0,0 @@
-totem-pl-parser
\ No newline at end of file
diff --git a/srcpkgs/gir-upower b/srcpkgs/gir-upower
deleted file mode 120000
index 9df007da7f..0000000000
--- a/srcpkgs/gir-upower
+++ /dev/null
@@ -1 +0,0 @@
-upower
\ No newline at end of file
diff --git a/srcpkgs/gir-webkit-gtk b/srcpkgs/gir-webkit-gtk
deleted file mode 120000
index dd01fa7988..0000000000
--- a/srcpkgs/gir-webkit-gtk
+++ /dev/null
@@ -1 +0,0 @@
-webkit-gtk
\ No newline at end of file
diff --git a/srcpkgs/gir-webkit-gtk3 b/srcpkgs/gir-webkit-gtk3
deleted file mode 120000
index bddb8d1978..0000000000
--- a/srcpkgs/gir-webkit-gtk3
+++ /dev/null
@@ -1 +0,0 @@
-webkit-gtk3
\ No newline at end of file
diff --git a/srcpkgs/gnome-bluetooth/gir-gnome-bluetooth.template b/srcpkgs/gnome-bluetooth/gir-gnome-bluetooth.template
deleted file mode 100644
index a685fbc467..0000000000
--- a/srcpkgs/gnome-bluetooth/gir-gnome-bluetooth.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gnome-bluetooth'.
-#
-short_desc="Introspection data for GNOME bluetooth"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- bluetooth libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index d3ae028ac9..8d1231ba0f 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -21,7 +21,7 @@ long_desc="
 
 triggers="gsettings-schemas" 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 # XXX: add nautilus-sendto support.
 Add_dependency run glibc
diff --git a/srcpkgs/gnome-desktop/gir-gnome-desktop.template b/srcpkgs/gnome-desktop/gir-gnome-desktop.template
deleted file mode 100644
index 49f6c872c9..0000000000
--- a/srcpkgs/gnome-desktop/gir-gnome-desktop.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gnome-desktop'.
-#
-short_desc="Introspection data for GNOME desktop"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- desktop libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 61c8ce2161..a8a317246c 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -17,7 +17,7 @@ long_desc="
   * The GNOME desktop manager proxy, which handles basic desktop
     management for applications that do not support XSM."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/gnome-menus/gir-gnome-menus.template b/srcpkgs/gnome-menus/gir-gnome-menus.template
deleted file mode 100644
index fe919907dc..0000000000
--- a/srcpkgs/gnome-menus/gir-gnome-menus.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-gnome-menus'.
-#
-short_desc="GMenu introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of GMenu in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run gnome-menus
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template
index d4bed3b346..64d42fc44e 100644
--- a/srcpkgs/gnome-menus/template
+++ b/srcpkgs/gnome-menus/template
@@ -11,7 +11,7 @@ long_desc="
  This package provides an implementation of the Desktop Menu Specification
  for the GNOME Desktop."
 
-subpackages="gir-$pkgname $pkgname-python $pkgname-devel"
+subpackages="$pkgname-python $pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/gnome-panel/gir-gnome-panel.template b/srcpkgs/gnome-panel/gir-gnome-panel.template
deleted file mode 100644
index bc86c5b3cb..0000000000
--- a/srcpkgs/gnome-panel/gir-gnome-panel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gnome-panel'.
-#
-short_desc="Introspection data for GNOME panel"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- panel libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 3ece8db854..d2703dbba4 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -25,7 +25,7 @@ window-list.schemas"
 gconf_entries="panel-default-setup.entries"
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run dbus-libs
diff --git a/srcpkgs/gnome-shell/gir-gnome-shell.template b/srcpkgs/gnome-shell/gir-gnome-shell.template
deleted file mode 100644
index a32a4f686a..0000000000
--- a/srcpkgs/gnome-shell/gir-gnome-shell.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gir-gnome-shell'.
-#
-short_desc="Introspection data for GNOME shell"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- shell libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib/girepository-1.0
-	mv ${SRCPKGDESTDIR}/usr/lib/gnome-shell/*.typelib \
-		${DESTDIR}/usr/lib/girepository-1.0
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 6d1186b714..a9e4e58663 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -15,7 +15,6 @@ long_desc="
  innovative user interface concepts to provide a visually attractive and
  easy to use experience."
 
-subpackages="gir-$pkgname"
 triggers="gsettings-schemas"
 gconf_schemas="$pkgname.schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
@@ -112,12 +111,16 @@ Add_dependency build GConf-devel
 Add_dependency build libsoup-devel
 Add_dependency build glib-devel
 
+Add_dependency full mutter
 Add_dependency full pygobject
 Add_dependency full dbus-python
+Add_dependency full gir-freedesktop
 Add_dependency full desktop-file-utils
 
-pre_build()
+pre_configure()
 {
+	# XXX Don't forget to change this if xulrunner version is bumped!
 	ldlibpaths="/usr/lib/xulrunner-1.9.2:/usr/lib/gnome-bluetooth"
+	export LDFLAGS="-Wl,-R/usr/lib/xulrunner-1.9.2 -Wl,-R/usr/lib/gnome-bluetooth"
 	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ldlibpaths"
 }
diff --git a/srcpkgs/gssdp/gir-gssdp.template b/srcpkgs/gssdp/gir-gssdp.template
deleted file mode 100644
index 29b3681372..0000000000
--- a/srcpkgs/gssdp/gir-gssdp.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-gssdp'.
-#
-short_desc="Introspection data for GUPNP gssdp"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for GUPNP gssdp."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template
index 23d8f13699..c3594931c9 100644
--- a/srcpkgs/gssdp/template
+++ b/srcpkgs/gssdp/template
@@ -1,6 +1,7 @@
 # Template file for 'gssdp'
 pkgname=gssdp
 version=0.9.0
+revision=1
 distfiles="http://gupnp.org/sites/all/files/sources/gssdp-$version.tar.gz"
 build_style=gnu_configure
 short_desc="GObject-based library for SSDP"
@@ -10,7 +11,7 @@ long_desc="
  A GObject-based API for doing SSDP (Simple Service Discovery Protocol)
  transparently."
 
-subpackages="gir-gssdp gssdp-devel"
+subpackages="gssdp-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/gst-plugins-base/gir-gst-plugins-base.template b/srcpkgs/gst-plugins-base/gir-gst-plugins-base.template
deleted file mode 100644
index e37431cb7f..0000000000
--- a/srcpkgs/gst-plugins-base/gir-gst-plugins-base.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-gst-plugins-base'.
-#
-short_desc="GStreamer base plugins introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of GStreamer base in
- plugins binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run gst-plugins-base
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template
index f2dedeafad..2ebb159b73 100644
--- a/srcpkgs/gst-plugins-base/template
+++ b/srcpkgs/gst-plugins-base/template
@@ -1,6 +1,7 @@
 # Template file for 'gst-plugins-base'.
 pkgname=gst-plugins-base
 version=0.10.32
+revision=1
 distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-experimental --disable-gnome_vfs"
@@ -17,7 +18,7 @@ long_desc="
 
  This package contains a set of well-maintained base plug-ins."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 Add_dependency run glibc
 Add_dependency run libgudev
 Add_dependency run gstreamer
diff --git a/srcpkgs/gstreamer/gir-gstreamer.template b/srcpkgs/gstreamer/gir-gstreamer.template
deleted file mode 100644
index 51c93a030a..0000000000
--- a/srcpkgs/gstreamer/gir-gstreamer.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-gstreamer'.
-#
-short_desc="GStreamer introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of GStreamer in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run gstreamer
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gstreamer/template b/srcpkgs/gstreamer/template
index 6dce128a4c..08c23e094c 100644
--- a/srcpkgs/gstreamer/template
+++ b/srcpkgs/gstreamer/template
@@ -1,6 +1,7 @@
 # Template file for 'gstreamer'.
 pkgname=gstreamer
 version=0.10.32
+revision=1
 distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-debug --disable-valgrind --enable-docbook
@@ -17,7 +18,7 @@ long_desc="
  transparently. Developers can add new codecs and filters by writing a simple
  plugin with a clean, generic interface."
 
-subpackages="gir-gstreamer $pkgname-devel"
+subpackages="$pkgname-devel"
 Add_dependency run glibc
 Add_dependency run libxml2
 Add_dependency run glib
@@ -30,8 +31,3 @@ Add_dependency build glib-devel
 Add_dependency build gobject-introspection
 Add_dependency build coreutils
 Add_dependency build diffutils
-
-pre_configure()
-{
-	export PATH="/bin:/usr/bin:$PATH"
-}
diff --git a/srcpkgs/gtk+/gir-gtk+.template b/srcpkgs/gtk+/gir-gtk+.template
deleted file mode 100644
index 9fcbe58eff..0000000000
--- a/srcpkgs/gtk+/gir-gtk+.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-gtk+'.
-#
-short_desc="Introspection data for GTK+"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GTK+ library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 2c231f4884..2320157ce9 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,6 +1,7 @@
 # Template build file for 'gtk+'.
 pkgname=gtk+
 version=2.24.1
+revision=1
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-cups --with-xinput"
@@ -20,7 +21,7 @@ long_desc="
 
 conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-immodules"
-subpackages="gir-gtk+ gtk+-devel"
+subpackages="gtk+-devel"
 
 Add_dependency run glibc
 Add_dependency run libXext
diff --git a/srcpkgs/gtk+3/gir-gtk+3.template b/srcpkgs/gtk+3/gir-gtk+3.template
deleted file mode 100644
index 9fcbe58eff..0000000000
--- a/srcpkgs/gtk+3/gir-gtk+3.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-gtk+'.
-#
-short_desc="Introspection data for GTK+"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GTK+ library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 71a2035e11..11e536925c 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,7 @@
 # Template build file for 'gtk+3'.
 pkgname=gtk+3
 version=3.0.1
+revision=1
 wrksrc="gtk+-${version}"
 distfiles="${GNOME_SITE}/gtk+/3.0/gtk+-$version.tar.bz2"
 build_style=gnu_configure
@@ -22,7 +23,7 @@ long_desc="
 
 triggers="gtk3-immodules gsettings-schemas"
 conf_files="/etc/gtk-3.0/im-multipress.conf"
-subpackages="gir-gtk+3 gtk+3-devel"
+subpackages="gtk+3-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/gtksourceview/gir-gtksourceview.template b/srcpkgs/gtksourceview/gir-gtksourceview.template
deleted file mode 100644
index 5c564700f7..0000000000
--- a/srcpkgs/gtksourceview/gir-gtksourceview.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gtksourceview'.
-#
-short_desc="Introspection data for GTKSourceView"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- GtkSourceView library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template
index 0ba95da680..2f6c6b242c 100644
--- a/srcpkgs/gtksourceview/template
+++ b/srcpkgs/gtksourceview/template
@@ -12,7 +12,7 @@ long_desc="
  widget GtkTextView. It improves GtkTextView by implementing syntax
  highlighting and other features typical of a source editor."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/gupnp/gir-gupnp.template b/srcpkgs/gupnp/gir-gupnp.template
deleted file mode 100644
index 91cdf7f4b9..0000000000
--- a/srcpkgs/gupnp/gir-gupnp.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gir-gupnp'.
-#
-short_desc="Introspection data for GUPNP"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for GUPNP."
-
-Add_dependency run gir-gssdp
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index df67b768d1..2de7558c93 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -1,6 +1,7 @@
 # Template file for 'gupnp'
 pkgname=gupnp
 version=0.14.0
+revision=1
 distfiles="http://gupnp.org/sites/all/files/sources/gupnp-$version.tar.gz"
 build_style=gnu_configure
 short_desc="GObject-based library for UPnP"
@@ -9,7 +10,7 @@ checksum=6ac13efe46c6f1e5d05e48e1041bf37dfa702839ce5fbb01e0f314f3904b6a16
 long_desc="
  A GObject-based API for doing UPnP transparently."
 
-subpackages="gir-gupnp gupnp-devel"
+subpackages="gupnp-devel"
 
 # XXX: missing libconic dependency.
 Add_dependency run glibc
diff --git a/srcpkgs/json-glib/gir-json-glib.template b/srcpkgs/json-glib/gir-json-glib.template
deleted file mode 100644
index 95d750125d..0000000000
--- a/srcpkgs/json-glib/gir-json-glib.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-json-glib'.
-#
-short_desc="Introspection data for json-glib"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- json-glib library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index b26ca6bdd7..5281223d86 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,6 +1,7 @@
 # Template build file for 'json-glib'.
 pkgname=json-glib
 version=0.12.2
+revision=1
 distfiles="${GNOME_SITE}/${pkgname}/0.12/${pkgname}-${version}.tar.bz2"
 build_style=gnu_configure
 short_desc="A JSON parser for GLib-based libraries and applications"
@@ -14,7 +15,7 @@ long_desc="
  integration, providing the ability to serialize and deserialize
  GObject instances to and from JSON data types."
 
-subpackages="gir-${pkgname} ${pkgname}-devel"
+subpackages="${pkgname}-devel"
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency build pkg-config
diff --git a/srcpkgs/libgdata/gir-gdata.template b/srcpkgs/libgdata/gir-gdata.template
deleted file mode 100644
index 0fbe8960af..0000000000
--- a/srcpkgs/libgdata/gir-gdata.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gdata'.
-#
-short_desc="Introspection data for libgdata"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the libgdata
- library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index f21c4df84c..256d41b3c9 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -11,7 +11,7 @@ long_desc="
  GData protocol — most notably, Google's services. It provides APIs to access
  the common Google services, and has full asynchronous support."
 
-subpackages="gir-gdata $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/libgnomekbd/gir-libgnomekbd.template b/srcpkgs/libgnomekbd/gir-libgnomekbd.template
deleted file mode 100644
index 099a9a3e52..0000000000
--- a/srcpkgs/libgnomekbd/gir-libgnomekbd.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-libgnomekbd'.
-#
-short_desc="Introspection data for libgnomekbd"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- gnomekbd library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libgnomekbd/template b/srcpkgs/libgnomekbd/template
index 414526efce..1c02f9c899 100644
--- a/srcpkgs/libgnomekbd/template
+++ b/srcpkgs/libgnomekbd/template
@@ -11,7 +11,7 @@ long_desc="
  This packages a keyboard configuration library for the GNOME desktop."
 
 triggers="gsettings-schemas" 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/libgweather/gir-gweather.template b/srcpkgs/libgweather/gir-gweather.template
deleted file mode 100644
index 09b1cb97b1..0000000000
--- a/srcpkgs/libgweather/gir-gweather.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gweather'.
-#
-short_desc="Introspection data for GNOME libgweather"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- weather libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index d693d87745..b37fbe6853 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -16,7 +16,7 @@ long_desc="
 
 gconf_schemas="gweather.schemas"
 gtk_iconcache_dirs="/usr/share/icons/gnome"
-subpackages="gir-gweather $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/libnotify/gir-notify.template b/srcpkgs/libnotify/gir-notify.template
deleted file mode 100644
index c87b24a00a..0000000000
--- a/srcpkgs/libnotify/gir-notify.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-notify'.
-#
-short_desc="Introspection data for libnotify"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the notify library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 21187a1032..c32ec35ca9 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -10,7 +10,7 @@ long_desc="
  libnotify is an implementation of the freedesktop.org desktop
  notification specification."
 
-subpackages="gir-notify $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/libpeas/gir-peas.template b/srcpkgs/libpeas/gir-peas.template
deleted file mode 100644
index 7ed2e87f35..0000000000
--- a/srcpkgs/libpeas/gir-peas.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-peas'.
-#
-short_desc="Introspection data for the Peas library"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the Peas library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index d89dc6932d..5344cf237e 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -16,7 +16,7 @@ long_desc="
  of features mirroring the desiderata of most of the applications providing an
  extension framework."
 
-subpackages="gir-peas $pkgname-devel"
+subpackages="$pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run glibc
diff --git a/srcpkgs/libsoup/gir-libsoup.template b/srcpkgs/libsoup/gir-libsoup.template
deleted file mode 100644
index 066c45fda6..0000000000
--- a/srcpkgs/libsoup/gir-libsoup.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-libsoup'.
-#
-short_desc="Introspection data for GNOME's libsoup"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- libsoup libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libsoup/libsoup-gnome.template b/srcpkgs/libsoup/libsoup-gnome.template
index 927ea117c9..9258d32d97 100644
--- a/srcpkgs/libsoup/libsoup-gnome.template
+++ b/srcpkgs/libsoup/libsoup-gnome.template
@@ -20,6 +20,8 @@ Add_dependency run libsoup
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/lib/girepository-1.0
 	mv ${SRCPKGDESTDIR}/usr/lib/libsoup-gnome*.so* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0/SoupGNOME* \
+		${DESTDIR}/usr/lib/girepository-1.0
 }
diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template
index f1dcee13be..5436e1fdff 100644
--- a/srcpkgs/libsoup/template
+++ b/srcpkgs/libsoup/template
@@ -28,7 +28,7 @@ long_desc="
    * HTTP server
    * Server support for Digest and Basic authentication"
 
-subpackages="gir-$pkgname $pkgname-gnome $pkgname-gnome-devel $pkgname-devel"
+subpackages="$pkgname-gnome $pkgname-gnome-devel $pkgname-devel"
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run libxml2
diff --git a/srcpkgs/libunique/gir-libunique.template b/srcpkgs/libunique/gir-libunique.template
deleted file mode 100644
index b2cb12dc39..0000000000
--- a/srcpkgs/libunique/gir-libunique.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-libunique'.
-#
-short_desc="Introspection data for libunique"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- libunique library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libunique/template b/srcpkgs/libunique/template
index 96cde0f635..463c6c3e2e 100644
--- a/srcpkgs/libunique/template
+++ b/srcpkgs/libunique/template
@@ -19,7 +19,7 @@ long_desc="
  Unique aims to replace the BaconMessageConnection code that has been copied
  by many projects and the code using Bonobo and D-Bus."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/libwnck/gir-libwnck.template b/srcpkgs/libwnck/gir-libwnck.template
deleted file mode 100644
index 0dc615f213..0000000000
--- a/srcpkgs/libwnck/gir-libwnck.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-libwnck'.
-#
-short_desc="Introspection data for GNOME's libwnck"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- libwnck library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 663efcef3b..ac9394d2ea 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -11,7 +11,7 @@ long_desc="
  libwnck is Window Navigator Construction Kit, i.e. a library to use
  for writing pagers and taskslists and stuff."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/lightdm/gir-lightdm.template b/srcpkgs/lightdm/gir-lightdm.template
deleted file mode 100644
index 588dceac84..0000000000
--- a/srcpkgs/lightdm/gir-lightdm.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-lightdm.
-#
-short_desc="${short_desc} - Introspection data"
-long_desc="${long_desc}
-
- This package contains GObject introspection data for LightDM."
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/gir* ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/lightdm/liblightdm-gobject.template b/srcpkgs/lightdm/liblightdm-gobject.template
index 1762814c33..06c2cea3c4 100644
--- a/srcpkgs/lightdm/liblightdm-gobject.template
+++ b/srcpkgs/lightdm/liblightdm-gobject.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the GObject support library for LightDM."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run dbus-libs
 Add_dependency run glib
@@ -17,4 +19,5 @@ do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/liblightdm-gobject*.so* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/mutter/gir-mutter.template b/srcpkgs/mutter/gir-mutter.template
deleted file mode 100644
index d99d6782a8..0000000000
--- a/srcpkgs/mutter/gir-mutter.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-mutter'.
-#
-short_desc="Introspection data for mutter"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for Mutter."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib/girepository-1.0
-	mv ${SRCPKGDESTDIR}/usr/lib/mutter/*.typelib \
-		${DESTDIR}/usr/lib/girepository-1.0
-}
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 85f2753dd7..6ecd55834c 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -17,7 +17,7 @@ long_desc="
  like Marshmallow Froot Loops; Metacity is like Cheerios.'"
 
 gconf_schemas="mutter.schemas"
-subpackages="gir-mutter mutter-devel"
+subpackages="mutter-devel"
 
 Add_dependency run glibc
 Add_dependency run gtk+3
diff --git a/srcpkgs/nautilus/gir-nautilus.template b/srcpkgs/nautilus/gir-nautilus.template
deleted file mode 100644
index 846015d28d..0000000000
--- a/srcpkgs/nautilus/gir-nautilus.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-nautilus'.
-#
-short_desc="Introspection data for GNOME Nautilus"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- Nautilus libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 0ee2703344..a0efb39968 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -14,7 +14,7 @@ long_desc="
 
 triggers="mimedb gsettings-schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run atk
diff --git a/srcpkgs/pango/gir-pango.template b/srcpkgs/pango/gir-pango.template
deleted file mode 100644
index 290b108d30..0000000000
--- a/srcpkgs/pango/gir-pango.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-pango'.
-#
-short_desc="Pango introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of Pango in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run pango
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index ae8caf966e..e8206f0b78 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,7 @@
 # Template build file for 'pango'.
 pkgname=pango
 version=1.28.3
+revision=1
 distfiles="${GNOME_SITE}/pango/1.28/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var"
@@ -29,7 +30,7 @@ long_desc="
  PangoLayout, a high level driver for laying out entire blocks of text,
  and routines to assist in editing internationalized text."
 
-subpackages="gir-pango pango-devel"
+subpackages="pango-devel"
 triggers="pango-modules"
 
 Add_dependency run glibc
diff --git a/srcpkgs/polkit-gnome/gir-polkit-gnome.template b/srcpkgs/polkit-gnome/gir-polkit-gnome.template
deleted file mode 100644
index ef2a8fd849..0000000000
--- a/srcpkgs/polkit-gnome/gir-polkit-gnome.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-polkit-gnome'.
-#
-short_desc="Introspection data for GNOME's PolicyKit"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- PolicyKit library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index f1ce252e0a..db02696067 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -17,7 +17,7 @@ long_desc="
 
  This package contains the glue to integrate with the GNOME desktop."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run polkit
diff --git a/srcpkgs/polkit/gir-polkit.template b/srcpkgs/polkit/gir-polkit.template
deleted file mode 100644
index d355ee7b88..0000000000
--- a/srcpkgs/polkit/gir-polkit.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-polkit'.
-#
-short_desc="PolicyKit introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of PolicyKit in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run polkit
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 6606eec014..b08d66c56e 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -16,7 +16,7 @@ long_desc="
  method) for unprivileged (desktop) applications."
 
 replaces="PolicyKit>=0"
-subpackages="gir-polkit polkit-devel"
+subpackages="polkit-devel"
 Add_dependency run glib
 Add_dependency run glibc
 Add_dependency run expat
diff --git a/srcpkgs/seahorse/gir-seahorse.template b/srcpkgs/seahorse/gir-seahorse.template
deleted file mode 100644
index d5a13f408b..0000000000
--- a/srcpkgs/seahorse/gir-seahorse.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-seahorse'.
-#
-short_desc="Introspection data for GNOME's seahorse"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- seahorse library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index e97c921d08..126ba0db6d 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -24,7 +24,7 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 gconf_schemas="$pkgname.schemas"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/telepathy-glib/gir-telepathy-glib.template b/srcpkgs/telepathy-glib/gir-telepathy-glib.template
deleted file mode 100644
index a6c1451c67..0000000000
--- a/srcpkgs/telepathy-glib/gir-telepathy-glib.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-telepathy-glib'.
-#
-short_desc="Introspection data for telepathy-glib"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- TelepathyGlib library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template
index 85b52fc293..e3cfb68014 100644
--- a/srcpkgs/telepathy-glib/template
+++ b/srcpkgs/telepathy-glib/template
@@ -13,7 +13,7 @@ long_desc="
  differences between protocols to provide a unified interface for
  applications."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency run dbus-libs
diff --git a/srcpkgs/totem-pl-parser/gir-totem-pl-parser.template b/srcpkgs/totem-pl-parser/gir-totem-pl-parser.template
deleted file mode 100644
index 40534b1bdc..0000000000
--- a/srcpkgs/totem-pl-parser/gir-totem-pl-parser.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-totem-pl-parser'.
-#
-short_desc="Introspection data for Totem Playlist Parser"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- Totem Playlist Parser."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template
index fbaec1fc7c..40b765357f 100644
--- a/srcpkgs/totem-pl-parser/template
+++ b/srcpkgs/totem-pl-parser/template
@@ -1,6 +1,7 @@
 # Template file for 'totem-pl-parser'
 pkgname=totem-pl-parser
 version=2.32.3
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var"
@@ -11,7 +12,7 @@ long_desc="
  $pkgname is a simple GObject-based library to parse a host of
  playlist formats, as well as save those."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
diff --git a/srcpkgs/totem/gir-totem.template b/srcpkgs/totem/gir-totem.template
deleted file mode 100644
index 0e5faaf989..0000000000
--- a/srcpkgs/totem/gir-totem.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-totem'.
-#
-short_desc="Introspection data for the Totem video player library"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- Totem video player library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index f9a57685b3..6ed9bd55ec 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -30,7 +30,7 @@ long_desc="
    * DVD, VCD and OGG/OGM subtitles with automatic language selection
    * Extensible with plugins"
 
-subpackages="gir-totem totem-devel totem-mozilla-plugin"
+subpackages="totem-devel totem-mozilla-plugin"
 triggers="gsettings-schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
diff --git a/srcpkgs/udev/gir-gudev.template b/srcpkgs/udev/gir-gudev.template
deleted file mode 100644
index 7a62a04f8e..0000000000
--- a/srcpkgs/udev/gir-gudev.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-gudev'.
-#
-short_desc="libgudev introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of libgudev in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run libgudev
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/udev/libgudev.template b/srcpkgs/udev/libgudev.template
index fd79e7233f..0f04ba50ea 100644
--- a/srcpkgs/udev/libgudev.template
+++ b/srcpkgs/udev/libgudev.template
@@ -6,6 +6,7 @@ long_desc="${long_desc}
  This package contains libgudev, a library to interact with udev through
  the GLib bindings."
 
+revision=1
 replaces="udev-glib>=0"
 Add_dependency run glibc
 Add_dependency run glib
@@ -13,6 +14,7 @@ Add_dependency run libudev
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/lib
+	mkdir -p ${DESTDIR}/lib ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/lib/libgudev* ${DESTDIR}/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template
index 21dec3e475..d0caca9908 100644
--- a/srcpkgs/udev/template
+++ b/srcpkgs/udev/template
@@ -15,7 +15,7 @@ long_desc="
 keep_empty_dirs=yes
 openrc_services="udev sysinit true"
 conf_files="/etc/udev/udev.conf"
-subpackages="gir-gudev libudev libudev-devel libgudev libgudev-devel"
+subpackages="libudev libudev-devel libgudev libgudev-devel"
 triggers="initramfs-tools"
 
 Add_dependency run glibc
diff --git a/srcpkgs/upower/gir-upower.template b/srcpkgs/upower/gir-upower.template
deleted file mode 100644
index 495d14a24d..0000000000
--- a/srcpkgs/upower/gir-upower.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-upower'.
-#
-short_desc="UPower introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of UPower in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run upower
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index c84dad8ad8..1393fba8ea 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,6 +1,7 @@
 # Template file for 'upower'
 pkgname=upower
 version=0.9.8
+revision=1
 distfiles="http://upower.freedesktop.org/releases/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --with-backend=linux"
@@ -15,7 +16,7 @@ long_desc="
  using PolicyKit."
 
 conf_files="/etc/UPower/UPower.conf"
-subpackages="upower-devel gir-upower"
+subpackages="upower-devel"
 
 Add_dependency run glibc
 Add_dependency run libusb
diff --git a/srcpkgs/webkit-gtk/gir-webkit-gtk.template b/srcpkgs/webkit-gtk/gir-webkit-gtk.template
deleted file mode 100644
index dcbce375e3..0000000000
--- a/srcpkgs/webkit-gtk/gir-webkit-gtk.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-webkit-gtk'.
-#
-short_desc="Introspection data for WebKit GTK+"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- WebKit GTK+ library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/webkit-gtk/template b/srcpkgs/webkit-gtk/template
index e28f99626e..c53260ca70 100644
--- a/srcpkgs/webkit-gtk/template
+++ b/srcpkgs/webkit-gtk/template
@@ -1,6 +1,7 @@
 # Template file for 'webkit-gtk'
 pkgname=webkit-gtk
 version=1.2.7
+revision=1
 wrksrc=webkit-${version}
 distfiles="http://www.webkitgtk.org/webkit-${version}.tar.gz"
 build_style=gnu_configure
@@ -20,7 +21,7 @@ long_desc="
 
  This is the GTK2+ port of the engine."
 
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run libgcc
 Add_dependency run glibc
diff --git a/srcpkgs/webkit-gtk3/gir-webkit-gtk3.template b/srcpkgs/webkit-gtk3/gir-webkit-gtk3.template
deleted file mode 100644
index dcbce375e3..0000000000
--- a/srcpkgs/webkit-gtk3/gir-webkit-gtk3.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-webkit-gtk'.
-#
-short_desc="Introspection data for WebKit GTK+"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- WebKit GTK+ library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/webkit-gtk3/template b/srcpkgs/webkit-gtk3/template
index d652980bee..25f078bac2 100644
--- a/srcpkgs/webkit-gtk3/template
+++ b/srcpkgs/webkit-gtk3/template
@@ -21,7 +21,7 @@ long_desc="
  This is the GTK3+ port of the engine."
 
 triggers="gsettings-schemas"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run libgcc
 Add_dependency run glibc