diff --git a/debian/changelog b/debian/changelog
index f8ab6b3..9e5d9aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,13 @@
         libpolkit-grant-dev, gnome-doc-utils and libxml-parser-perl.
       + Add libpolkit-{agent,gobject}-dev (>= 0.93).
       + Bump libgtk2.0-dev to (>= 2.17.1) and gtk-doc-tools to (>= 1.3).
+  * Update package layout
+    - Rename policykit-gnome → policykit-1-gnome.
+    - Update libpolkit-gnome → libpolkit-gtk.
+    - Drop policykit-gnome-doc, include API documentation in
+      libpolkit-gtk-1-dev.
+  * Update and revise all *.install files.
+  * Add symbols file for libpolkit-gtk.
 
  -- Michael Biebl <biebl@debian.org>  Sun, 27 Sep 2009 01:50:40 +0200
 
diff --git a/debian/control b/debian/control
index f75acf6..1c1038d 100644
--- a/debian/control
+++ b/debian/control
@@ -18,36 +18,30 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/policykit-gnome
 Homepage: http://hal.freedesktop.org/docs/PolicyKit-gnome/
 
-Package: policykit-gnome
+Package: policykit-1-gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, policykit (>= 0.9), dbus-x11
-Description: GNOME dialogs for PolicyKit
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1
+Description: GNOME authentication agent for PolicyKit-1
  PolicyKit-gnome provides a D-Bus session bus service that is used to
  bring up authentication dialogs used for obtaining privileges.
 
-Package: policykit-gnome-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: devhelp
-Description: PolicyKit-gnome API documentation
- This package contains the API documentation for PolicyKit-gnome.
-
-Package: libpolkit-gnome0
+Package: libpolkit-gtk-1-0
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: PolicyKit-gnome library
- libpolkit-gnome provides conenience functions for using PolicyKit from within
- GTK+ and GNOME applications.
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1-gnome
+Description: PolicyKit GTK+ API
+ PolicyKit is a toolkit for defining and handling the policy that
+ allows unprivileged processes to speak to privileged processes.
+ .
+ This package contains a library for accessing PolicyKit GTK+ functionality.
 
-Package: libpolkit-gnome-dev
+Package: libpolkit-gtk-1-dev
 Architecture: any
 Section: libdevel
-Depends: libpolkit-gnome0 (= ${binary:Version}), ${misc:Depends}, libpolkit-dev, libpolkit-dbus-dev, libpolkit-grant-dev, libgtk2.0-dev
-Description: PolicyKit-gnome development files
- libpolkit-gnome provides conenience functions for using PolicyKit from within
- GTK+ and GNOME applications.
+Depends: libpolkit-gtk-1-0 (= ${binary:Version}), ${misc:Depends}, libpolkit-gobject-1-dev
+Description: PolicyKit GTK+ API - development files
+ PolicyKit is a toolkit for defining and handling the policy that
+ allows unprivileged processes to speak to privileged processes.
  .
- This package contains the development libraries and headers. 
-
+ This package contains the development files for the library found in
+ libpolkit-gtk-1-0.
diff --git a/debian/libpolkit-gnome-dev.install b/debian/libpolkit-gnome-dev.install
deleted file mode 100644
index 1ab939a..0000000
--- a/debian/libpolkit-gnome-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/pkgconfig/
-debian/tmp/usr/lib/*.{so,a}
-debian/tmp/usr/include/
diff --git a/debian/libpolkit-gnome0.install b/debian/libpolkit-gnome0.install
deleted file mode 100644
index 79bbe2f..0000000
--- a/debian/libpolkit-gnome0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*.so.*
diff --git a/debian/libpolkit-gnome0.symbols b/debian/libpolkit-gnome0.symbols
deleted file mode 100644
index f0d1d5d..0000000
--- a/debian/libpolkit-gnome0.symbols
+++ /dev/null
@@ -1,18 +0,0 @@
-libpolkit-gnome.so.0 libpolkit-gnome0 #MINVER#
- polkit_gnome_action_create_button@Base 0.7
- polkit_gnome_action_get_polkit_result@Base 0.7
- polkit_gnome_action_get_sensitive@Base 0.7
- polkit_gnome_action_get_type@Base 0.7
- polkit_gnome_action_get_visible@Base 0.7
- polkit_gnome_action_new@Base 0.7
- polkit_gnome_action_new_default@Base 0.7
- polkit_gnome_action_set_sensitive@Base 0.7
- polkit_gnome_action_set_visible@Base 0.7
- polkit_gnome_auth_obtain@Base 0.7
- polkit_gnome_context_error_quark@Base 0.7
- polkit_gnome_context_get@Base 0.7
- polkit_gnome_context_get_type@Base 0.7
- polkit_gnome_toggle_action_create_toggle_button@Base 0.7
- polkit_gnome_toggle_action_get_type@Base 0.7
- polkit_gnome_toggle_action_new@Base 0.7
- polkit_gnome_toggle_action_new_default@Base 0.7
diff --git a/debian/libpolkit-gtk-1-0.install b/debian/libpolkit-gtk-1-0.install
new file mode 100644
index 0000000..0098ab9
--- /dev/null
+++ b/debian/libpolkit-gtk-1-0.install
@@ -0,0 +1 @@
+usr/lib/libpolkit-gtk-1.so.*
diff --git a/debian/libpolkit-gtk-1-0.symbols b/debian/libpolkit-gtk-1-0.symbols
new file mode 100644
index 0000000..9ac274e
--- /dev/null
+++ b/debian/libpolkit-gtk-1-0.symbols
@@ -0,0 +1,9 @@
+libpolkit-gtk-1.so.0 libpolkit-gtk-1-0 #MINVER#
+ polkit_lock_button_get_can_obtain@Base 0.94
+ polkit_lock_button_get_is_authorized@Base 0.94
+ polkit_lock_button_get_is_visible@Base 0.94
+ polkit_lock_button_get_type@Base 0.94
+ polkit_lock_button_new@Base 0.94
+ polkit_lock_button_set_lock_text@Base 0.94
+ polkit_lock_button_set_not_authorized_text@Base 0.94
+ polkit_lock_button_set_unlock_text@Base 0.94
diff --git a/debian/libpolkit-gtk-1-dev.install b/debian/libpolkit-gtk-1-dev.install
new file mode 100644
index 0000000..906bcf9
--- /dev/null
+++ b/debian/libpolkit-gtk-1-dev.install
@@ -0,0 +1,4 @@
+usr/lib/pkgconfig/
+usr/include/
+usr/lib/libpolkit-gtk-*.{so,a}
+usr/share/gtk-doc/html/polkit-gtk-1/
diff --git a/debian/policykit-1-gnome.install b/debian/policykit-1-gnome.install
new file mode 100644
index 0000000..ead72dd
--- /dev/null
+++ b/debian/policykit-1-gnome.install
@@ -0,0 +1,3 @@
+usr/lib/policykit-1-gnome/
+etc/xdg/autostart/
+usr/share/locale/
diff --git a/debian/policykit-gnome-doc.install b/debian/policykit-gnome-doc.install
deleted file mode 100644
index e29d2e6..0000000
--- a/debian/policykit-gnome-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/gtk-doc/html/polkit-gnome/* usr/share/doc/policykit-gnome-doc/html/
diff --git a/debian/policykit-gnome-doc.links b/debian/policykit-gnome-doc.links
deleted file mode 100644
index cc6a852..0000000
--- a/debian/policykit-gnome-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/policykit-gnome-doc/html/ usr/share/gtk-doc/html/polkit-gnome
diff --git a/debian/policykit-gnome.install b/debian/policykit-gnome.install
deleted file mode 100644
index fd868cd..0000000
--- a/debian/policykit-gnome.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/lib/policykit-gnome/polkit-gnome-manager
-debian/tmp/usr/bin/*
-debian/tmp/usr/share/dbus-1/services/
-debian/tmp/usr/share/applications/
-debian/tmp/usr/share/locale/