diff -Nru gdm-3.14.1/debian/changelog gdm-3.14.1/debian/changelog
--- gdm-3.14.1/debian/changelog 2015-01-09 08:00:59.000000000 +1100
+++ gdm-3.14.1/debian/changelog 2015-02-28 16:47:01.000000000 +1100
@@ -1,3 +1,9 @@
+gdm (3.14.1-0ubuntu2) vivid; urgency=medium
+
+  * Drop the caribou autostart file, we start it via gnome-shell
+
+ -- Jackson Doak <noskcaj@ubuntu.com>  Sat, 28 Feb 2015 16:46:34 +1100
+
 gdm (3.14.1-0ubuntu1) vivid; urgency=medium

   * New upstream release.
diff -Nru gdm-3.14.1/debian/rules gdm-3.14.1/debian/rules
--- gdm-3.14.1/debian/rules 2015-01-09 07:56:17.000000000 +1100
+++ gdm-3.14.1/debian/rules 2015-02-28 16:46:26.000000000 +1100
@@ -12,7 +12,7 @@

 # List any files which are not installed
 include /usr/share/cdbs/1/rules/utils.mk
-DEB_DH_INSTALL_ARGS := --list-missing
+DEB_DH_INSTALL_ARGS := --list-missing -Xcaribou
 DEB_DH_INSTALLINIT_ARGS := --no-start

 GNOME_MODULE := gdm