diff --git a/debian/changelog b/debian/changelog
index 49bbdac7..3a8c1003 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libgtop2 (2.28.3-2) UNRELEASED; urgency=low
+
+  * debian/control.in, debian/gir1.2-gtop-2.0.install: Add gir1.2-gtop-2.0
+    package to add GI support.
+  * debian/libgtop2-dev.install: Install .gir.
+
+ -- Martin Pitt <mpitt@debian.org>  Fri, 27 May 2011 09:51:50 +0200
+
 libgtop2 (2.28.3-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index dfbada97..0d94a30d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Source: libgtop2
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 5),
                gettext,
                pkg-config,
@@ -24,7 +24,10 @@ Build-Depends: debhelper (>= 5),
                libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
                libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
                libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
-               gtk-doc-tools (>= 1.4)
+               gtk-doc-tools (>= 1.4),
+               gobject-introspection (>= 0.6.7),
+               libgirepository1.0-dev (>= 0.6.7),
+               gir1.2-glib-2.0
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
@@ -44,7 +47,8 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev
+         libglib2.0-dev,
+         gir1.2-gtop-2.0
 Description: gtop system monitoring library (devel)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -74,3 +78,16 @@ Description: gtop system monitoring library (documentation)
  system. It is used by the GNOME desktop environment.
  .
  This package contains the documentation.
+
+Package: gir1.2-gtop-2.0
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         ${gir:Depends}
+Description: gtop system monitoring library (gir bindings)
+ The gtop library reads information about processes and the state of the
+ system. It is used by the GNOME desktop environment.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings. 
+
diff --git a/debian/control.in b/debian/control.in
index 7d956259..990b4da5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -19,7 +19,10 @@ Build-Depends: debhelper (>= 5),
                libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
                libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
                libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
-               gtk-doc-tools (>= 1.4)
+               gtk-doc-tools (>= 1.4),
+               gobject-introspection (>= 0.6.7),
+               libgirepository1.0-dev (>= 0.6.7),
+               gir1.2-glib-2.0
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
@@ -39,7 +42,8 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev
+         libglib2.0-dev,
+         gir1.2-gtop-2.0
 Description: gtop system monitoring library (devel)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -69,3 +73,16 @@ Description: gtop system monitoring library (documentation)
  system. It is used by the GNOME desktop environment.
  .
  This package contains the documentation.
+
+Package: gir1.2-gtop-2.0
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         ${gir:Depends}
+Description: gtop system monitoring library (gir bindings)
+ The gtop library reads information about processes and the state of the
+ system. It is used by the GNOME desktop environment.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings. 
+
diff --git a/debian/gir1.2-gtop-2.0.install b/debian/gir1.2-gtop-2.0.install
new file mode 100644
index 00000000..318141bf
--- /dev/null
+++ b/debian/gir1.2-gtop-2.0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/girepository-*
diff --git a/debian/libgtop2-dev.install b/debian/libgtop2-dev.install
index cb9832cb..dcba585c 100644
--- a/debian/libgtop2-dev.install
+++ b/debian/libgtop2-dev.install
@@ -2,3 +2,4 @@ debian/tmp/usr/include/libgtop-2.0
 debian/tmp/usr/lib/libgtop-2.0.a
 debian/tmp/usr/lib/libgtop-2.0.so
 debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gir-*