diff -Nru lightdm-1.7.17/debian/changelog lightdm-1.7.17/debian/changelog
--- lightdm-1.7.17/debian/changelog	2013-09-25 02:06:47.000000000 +0200
+++ lightdm-1.7.17/debian/changelog	2013-10-04 17:12:48.000000000 +0200
@@ -1,3 +1,11 @@
+lightdm (1.7.17-0ubuntu1.1) saucy; urgency=low
+
+  * debian/patches/10_dont-fail-writing-x-authority-if-reading-it-had-an-error.patch:
+    Don't fail writing X authority if reading it had an error (LP: #1036830,
+    LP: #1228570).
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Fri, 04 Oct 2013 17:12:34 +0200
+
 lightdm (1.7.17-0ubuntu1) saucy; urgency=low
 
   * New upstream release:
diff -Nru lightdm-1.7.17/debian/patches/10_dont-fail-writing-x-authority-if-reading-it-had-an-error.patch lightdm-1.7.17/debian/patches/10_dont-fail-writing-x-authority-if-reading-it-had-an-error.patch
--- lightdm-1.7.17/debian/patches/10_dont-fail-writing-x-authority-if-reading-it-had-an-error.patch	1970-01-01 01:00:00.000000000 +0100
+++ lightdm-1.7.17/debian/patches/10_dont-fail-writing-x-authority-if-reading-it-had-an-error.patch	2013-10-04 17:09:56.000000000 +0200
@@ -0,0 +1,19 @@
+--- a/src/x-authority.c
++++ b/src/x-authority.c
+@@ -237,7 +237,7 @@
+ gboolean
+ x_authority_write (XAuthority *auth, XAuthWriteMode mode, const gchar *filename, GError **error)
+ {
+-    gchar *input;
++    gchar *input = NULL;
+     gsize input_length = 0, input_offset = 0;
+     GList *link, *records = NULL;
+     XAuthority *a;
+@@ -328,6 +328,7 @@
+     }
+ 
+     errno = 0;
++    result = TRUE;
+     for (link = records; link && result; link = link->next)
+     {
+         XAuthority *a = link->data;
diff -Nru lightdm-1.7.17/debian/patches/series lightdm-1.7.17/debian/patches/series
--- lightdm-1.7.17/debian/patches/series	2013-08-22 00:16:36.000000000 +0200
+++ lightdm-1.7.17/debian/patches/series	2013-10-04 17:08:22.000000000 +0200
@@ -1,2 +1,3 @@
+10_dont-fail-writing-x-authority-if-reading-it-had-an-error.patch
 01_transition_ubuntu2d_ubuntu_desktop.patch
 04_language_handling.patch