diff -Nru upower-0.9.15/debian/changelog upower-0.9.15/debian/changelog
--- upower-0.9.15/debian/changelog	2012-04-03 10:41:48.000000000 +0000
+++ upower-0.9.15/debian/changelog	2012-04-13 12:40:10.000000000 +0000
@@ -1,3 +1,13 @@
+upower (0.9.15-3git1) precise; urgency=low
+
+  Upload current Debian packaging git head.
+
+  * Add 00git_update_dock_after_suspend.patch: Re-coldplug dock status when
+    resuming from sleep. Patch by Evan Broder, thanks! Also committed
+    upstream. (LP: #980746)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 13 Apr 2012 14:39:59 +0200
+
 upower (0.9.15-3) unstable; urgency=low
 
   * debian/tests/control: Add missing python3 and python3-gi test
diff -Nru upower-0.9.15/debian/patches/00git_update_dock_after_suspend.patch upower-0.9.15/debian/patches/00git_update_dock_after_suspend.patch
--- upower-0.9.15/debian/patches/00git_update_dock_after_suspend.patch	1970-01-01 00:00:00.000000000 +0000
+++ upower-0.9.15/debian/patches/00git_update_dock_after_suspend.patch	2012-04-13 12:14:29.000000000 +0000
@@ -0,0 +1,62 @@
+From 6fb36eb5eb85386d2e1c5d9fb760d68053d8afc5 Mon Sep 17 00:00:00 2001
+From: Evan Broder <evan@ebroder.net>
+Date: Wed, 11 Apr 2012 07:19:06 +0000
+Subject: Re-coldplug dock status when resuming from sleep
+
+It's possible for the docked state of a laptop (i.e. the display
+connectivity state) to change while the laptop is asleep.
+
+Signed-off-by: Evan Broder <evan@ebroder.net>
+Signed-off-by: Richard Hughes <richard@hughsie.com>
+---
+diff --git a/src/linux/up-dock.c b/src/linux/up-dock.c
+index 78fb7d3..f9a7c67 100644
+--- a/src/linux/up-dock.c
++++ b/src/linux/up-dock.c
+@@ -33,6 +33,7 @@ struct UpDockPrivate
+ 	UpDaemon		*daemon;
+ 	GUdevClient		*gudev_client;
+ 	guint			 poll_id;
++	guint                    notify_resume_id;
+ };
+ 
+ G_DEFINE_TYPE (UpDock, up_dock, G_TYPE_OBJECT)
+@@ -120,6 +121,17 @@ up_dock_set_should_poll (UpDock *dock, gboolean should_poll)
+ }
+ 
+ /**
++ * up_dock_notify_resume_cb
++ */
++static void
++up_dock_notify_resume_cb (UpDaemon *daemon,
++			  const gchar *sleep_kind,
++			  UpDock *dock)
++{
++	up_dock_refresh (dock);
++}
++
++/**
+  * up_dock_coldplug:
+  **/
+ gboolean
+@@ -127,6 +139,9 @@ up_dock_coldplug (UpDock *dock, UpDaemon *daemon)
+ {
+ 	/* save daemon */
+ 	dock->priv->daemon = g_object_ref (daemon);
++	dock->priv->notify_resume_id = g_signal_connect (dock->priv->daemon, "notify-resume",
++							 G_CALLBACK (up_dock_notify_resume_cb),
++							 dock);
+ 	return up_dock_refresh (dock);
+ }
+ 
+@@ -170,6 +185,8 @@ up_dock_finalize (GObject *object)
+ 	g_return_if_fail (dock->priv != NULL);
+ 
+ 	g_object_unref (dock->priv->gudev_client);
++	if (dock->priv->notify_resume_id != 0)
++		g_signal_handler_disconnect (dock->priv->daemon, dock->priv->notify_resume_id);
+ 	if (dock->priv->daemon != NULL)
+ 		g_object_unref (dock->priv->daemon);
+ 	if (dock->priv->poll_id != 0)
+--
+cgit v0.9.0.2-2-gbebe
diff -Nru upower-0.9.15/debian/patches/series upower-0.9.15/debian/patches/series
--- upower-0.9.15/debian/patches/series	2012-04-03 10:41:48.000000000 +0000
+++ upower-0.9.15/debian/patches/series	2012-04-13 12:14:29.000000000 +0000
@@ -1,3 +1,4 @@
 # Debian patches for upower
 00git_fix_libusb_crash.patch
+00git_update_dock_after_suspend.patch
 01-systemd-service.patch