diff -Nru gparted-0.5.1/debian/changelog gparted-0.5.1/debian/changelog
--- gparted-0.5.1/debian/changelog	2010-03-09 00:37:51.000000000 +0000
+++ gparted-0.5.1/debian/changelog	2010-07-20 13:26:34.000000000 +0100
@@ -1,3 +1,11 @@
+gparted (0.5.1-1ubuntu3) lucid-proposed; urgency=low
+
+  * Add 02_udisks.patch: Use udisks in favor of devicekit-disks and hal to
+    inhibit automount while gparted is running. Patch backported from 6.0.
+    (LP: #588530)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 20 Jul 2010 14:24:10 +0200
+
 gparted (0.5.1-1ubuntu2) lucid; urgency=low
 
   * Build against parted 2.2.
diff -Nru gparted-0.5.1/debian/patches/02_udisks.patch gparted-0.5.1/debian/patches/02_udisks.patch
--- gparted-0.5.1/debian/patches/02_udisks.patch	1970-01-01 01:00:00.000000000 +0100
+++ gparted-0.5.1/debian/patches/02_udisks.patch	2010-07-23 09:38:42.000000000 +0100
@@ -0,0 +1,64 @@
+From 4168794e8e80d2d6457d87f33983cee2d836f527 Mon Sep 17 00:00:00 2001
+From: Curtis Gedak <gedakc@gmail.com>
+Date: Tue, 01 Jun 2010 23:04:39 +0000
+Subject: Handle devkit-disks being renamed to udisks on Dec. 1, 2009.
+
+Reference link for devkit-disks being renamed to udisks:
+http://www.freedesktop.org/wiki/Software/DeviceKit-disks
+
+Bug-Ubuntu: https://launchpad.net/bugs/588530
+---
+Index: gparted-0.5.1/gparted.in
+===================================================================
+--- gparted-0.5.1.orig/gparted.in	2009-10-20 17:06:59.000000000 +0200
++++ gparted-0.5.1/gparted.in	2010-07-23 10:38:37.609267087 +0200
+@@ -9,8 +9,23 @@
+ #
+ 
+ #
++#  Search PATH to determine if udisks program can be found
++#  and if appropriate daemon is running.
++#
++HAVE_UDISKS=no
++for k in '' `echo "$PATH" | sed 's,:, ,g'`; do
++	if test -x "$k/udisks"; then
++		if test "z`ps -e | grep udisks-daemon`" != "z"; then
++			HAVE_UDISKS=yes
++			break
++		fi
++	fi
++done
++
++#
+ #  Search PATH to determine if devkit-disks program can be found
+ #  and if appropriate daemon is running.
++#  On December 1, 2009, devkit-disks was named udisks.
+ #
+ HAVE_DEVKIT_DISKS=no
+ for k in '' `echo "$PATH" | sed 's,:, ,g'`; do
+@@ -37,14 +52,22 @@
+ done
+ 
+ #
+-#  Use both devkit-disks and hal-lock for invocation if both binaries exist
++#  Use both udisks and hal-lock if both binaries exists and both daemons are running.
++#  Else use udisks if binary exists and daemon is running.
++#  Else use both devkit-disks and hal-lock for invocation if both binaries exist
+ #  and both of the daemons are running.
+-#  Else use devkit-disks for invocation if binary exists and daemon is running.
++#  Else use devkit-disks if binary exists and daemon is running.
+ #  Otherwise use hal-lock for invocation if binary exists and daemon is running.
+ #  If the above checks fail then simply run gpartedbin.
+ #
+ BASE_CMD="@installdir@/gpartedbin $*"
+-if test "x$HAVE_DEVKIT_DISKS" = "xyes" && test "x$HAVE_HAL_LOCK" = "xyes"; then
++if test "x$HAVE_UDISKS" = "xyes" && test "x$HAVE_HAL_LOCK" = "xyes"; then
++	udisks --inhibit -- \
++		hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive \
++			--run "$BASE_CMD"
++elif test "x$HAVE_UDISKS" = "xyes"; then
++	udisks --inhibit -- $BASE_CMD
++elif test "x$HAVE_DEVKIT_DISKS" = "xyes" && test "x$HAVE_HAL_LOCK" = "xyes"; then
+ 	devkit-disks --inhibit -- \
+ 		hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive \
+ 			--run "$BASE_CMD"
diff -Nru gparted-0.5.1/debian/patches/series gparted-0.5.1/debian/patches/series
--- gparted-0.5.1/debian/patches/series	2010-02-22 15:37:38.000000000 +0000
+++ gparted-0.5.1/debian/patches/series	2010-07-20 13:23:56.000000000 +0100
@@ -1 +1,2 @@
 01_fix-desktop.patch
+02_udisks.patch