diff -Nru accountsservice-0.6.40/debian/changelog accountsservice-0.6.40/debian/changelog
--- accountsservice-0.6.40/debian/changelog	2016-03-16 22:42:11.000000000 +1100
+++ accountsservice-0.6.40/debian/changelog	2016-04-06 11:00:37.000000000 +1000
@@ -1,3 +1,11 @@
+accountsservice (0.6.40-2ubuntu9) UNRELEASED; urgency=medium
+
+  * debian/patches/0005-gdm_config_file_path_ubuntu.patch:
+    Copy patch from Debian packaging to correct the path to the
+    GDM config file. (LP: #1547297) 
+
+ -- Tim Lunn <tim@feathertop.org>  Wed, 06 Apr 2016 10:59:09 +1000
+
 accountsservice (0.6.40-2ubuntu8) xenial; urgency=medium
 
   * debian/patches/0009-language-tools.patch:
diff -Nru accountsservice-0.6.40/debian/patches/0005-gdm_config_file_path_ubuntu.patch accountsservice-0.6.40/debian/patches/0005-gdm_config_file_path_ubuntu.patch
--- accountsservice-0.6.40/debian/patches/0005-gdm_config_file_path_ubuntu.patch	1970-01-01 10:00:00.000000000 +1000
+++ accountsservice-0.6.40/debian/patches/0005-gdm_config_file_path_ubuntu.patch	2016-04-06 10:57:45.000000000 +1000
@@ -0,0 +1,22 @@
+Description: Fix path to the GDM configuration file, which is different
+ in Debian/Ubuntu.
+Author: Josselin Mouette <joss@debian.org>
+Bug-Debian: http://bugs.debian.org/627311
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49993
+---
+ src/daemon.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: accountsservice-0.6.40/src/daemon.c
+===================================================================
+--- accountsservice-0.6.40.orig/src/daemon.c
++++ accountsservice-0.6.40/src/daemon.c
+@@ -48,7 +48,7 @@
+ #define PATH_PASSWD "/etc/passwd"
+ #define PATH_SHADOW "/etc/shadow"
+ #define PATH_GROUP "/etc/group"
+-#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf"
++#define PATH_GDM_CUSTOM "/etc/gdm3/custom.conf"
+ 
+ enum {
+         PROP_0,
diff -Nru accountsservice-0.6.40/debian/patches/0007-add-lightdm-support.patch accountsservice-0.6.40/debian/patches/0007-add-lightdm-support.patch
--- accountsservice-0.6.40/debian/patches/0007-add-lightdm-support.patch	2015-08-14 11:32:02.000000000 +1000
+++ accountsservice-0.6.40/debian/patches/0007-add-lightdm-support.patch	2016-04-06 11:03:03.000000000 +1000
@@ -15,7 +15,7 @@
 @@ -49,6 +49,7 @@
  #define PATH_SHADOW "/etc/shadow"
  #define PATH_GROUP "/etc/group"
- #define PATH_GDM_CUSTOM "/etc/gdm/custom.conf"
+ #define PATH_GDM_CUSTOM "/etc/gdm3/custom.conf"
 +#define PATH_LIGHTDM_CONFIG "/etc/lightdm/lightdm.conf"
  
  enum {
diff -Nru accountsservice-0.6.40/debian/patches/0021-support-extrausers.patch accountsservice-0.6.40/debian/patches/0021-support-extrausers.patch
--- accountsservice-0.6.40/debian/patches/0021-support-extrausers.patch	2015-08-14 11:32:02.000000000 +1000
+++ accountsservice-0.6.40/debian/patches/0021-support-extrausers.patch	2016-04-06 11:03:37.000000000 +1000
@@ -12,7 +12,7 @@
 +#define PATH_EXTRAUSERS_PASSWD "/var/lib/extrausers/passwd"
 +#define PATH_EXTRAUSERS_SHADOW "/var/lib/extrausers/shadow"
 +#define PATH_EXTRAUSERS_GROUP "/var/lib/extrausers/group"
- #define PATH_GDM_CUSTOM "/etc/gdm/custom.conf"
+ #define PATH_GDM_CUSTOM "/etc/gdm3/custom.conf"
  #define PATH_LIGHTDM_CONFIG "/etc/lightdm/lightdm.conf"
  
 @@ -67,6 +70,9 @@ struct DaemonPrivate {
diff -Nru accountsservice-0.6.40/debian/patches/series accountsservice-0.6.40/debian/patches/series
--- accountsservice-0.6.40/debian/patches/series	2016-01-09 05:35:39.000000000 +1100
+++ accountsservice-0.6.40/debian/patches/series	2016-04-06 10:53:24.000000000 +1000
@@ -1,5 +1,6 @@
 0001-formats-locale-property.patch
 0002-create-and-manage-groups-like-on-a-ubuntu-system.patch
+0005-gdm_config_file_path_ubuntu.patch
 0006-adduser_instead_of_useradd.patch
 0007-add-lightdm-support.patch
 0008-nopasswdlogin-group.patch