diff -Nru gnome-desktop3-3.8.4/debian/changelog gnome-desktop3-3.8.4/debian/changelog
--- gnome-desktop3-3.8.4/debian/changelog	2013-09-04 21:15:01.000000000 +0200
+++ gnome-desktop3-3.8.4/debian/changelog	2013-12-03 15:59:39.000000000 +0100
@@ -1,3 +1,10 @@
+gnome-desktop3 (3.8.4-0ubuntu2) trusty; urgency=low
+
+  * debian/patches/ignore_errors_with_primary_outputs.patch:
+    - Ignore failures when setting the primary output (LP: 1224254).
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 03 Dec 2013 15:58:57 +0100
+
 gnome-desktop3 (3.8.4-0ubuntu1) saucy; urgency=low
 
   * New upstream bugfix release
diff -Nru gnome-desktop3-3.8.4/debian/control gnome-desktop3-3.8.4/debian/control
--- gnome-desktop3-3.8.4/debian/control	2013-09-04 21:15:05.000000000 +0200
+++ gnome-desktop3-3.8.4/debian/control	2013-12-03 16:18:41.000000000 +0100
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Sjoerd Simons <sjoerd@debian.org>
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-desktop3
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-desktop3
 Standards-Version: 3.9.4
diff -Nru gnome-desktop3-3.8.4/debian/patches/ignore_errors_with_primary_outputs.patch gnome-desktop3-3.8.4/debian/patches/ignore_errors_with_primary_outputs.patch
--- gnome-desktop3-3.8.4/debian/patches/ignore_errors_with_primary_outputs.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-desktop3-3.8.4/debian/patches/ignore_errors_with_primary_outputs.patch	2013-12-03 15:54:33.000000000 +0100
@@ -0,0 +1,36 @@
+From 05f2f3cf6e53b8a5232c3d950418ea5f122e12fb Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone@canonical.com>
+Date: Tue, 3 Dec 2013 15:48:04 +0100
+Subject: [PATCH 1/1] gnome-rr.c: ignore the error if setting the primary
+ output fails
+
+We already trap and ignore the error when detecting the primary
+output, so, according to the same logic, we should do the same
+when trying to set the primary output.
+
+This helps with drivers such as modesetting that do not play
+well with primary outputs (LP: #1224254).
+---
+ libgnome-desktop/gnome-rr.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index 5ae52b2..09e44cd 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -2148,8 +2148,11 @@ gnome_rr_screen_set_primary_output (GnomeRRScreen *screen,
+     else
+         id = None;
+ 
+-    if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv))
++    if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv)) {
++        gdk_error_trap_push ();
+         XRRSetOutputPrimary (priv->xdisplay, priv->xroot, id);
++        gdk_error_trap_pop_ignored ();
++    }
+ }
+ 
+ /* GnomeRRCrtc */
+-- 
+1.7.9.5
+
diff -Nru gnome-desktop3-3.8.4/debian/patches/series gnome-desktop3-3.8.4/debian/patches/series
--- gnome-desktop3-3.8.4/debian/patches/series	2013-09-04 21:15:01.000000000 +0200
+++ gnome-desktop3-3.8.4/debian/patches/series	2013-12-03 15:54:33.000000000 +0100
@@ -6,3 +6,4 @@
 ubuntu_language.patch
 ubuntu_language_list_from_SUPPORTED.patch
 git_no_filename_warning.patch
+ignore_errors_with_primary_outputs.patch