diff -Nru gnome-terminal-3.6.0/debian/changelog gnome-terminal-3.6.0/debian/changelog
--- gnome-terminal-3.6.0/debian/changelog	2012-09-25 09:26:46.000000000 +0000
+++ gnome-terminal-3.6.0/debian/changelog	2013-10-10 09:20:42.000000000 +0000
@@ -1,3 +1,11 @@
+gnome-terminal (3.6.0-0ubuntu1.1) quantal-proposed; urgency=low
+
+  * debian/patches/00_git_fix_geometry_on_focusout.patch:
+     - backport an upstream patch to not resize the geometry when having tabs
+       on focus out (LP: #1040885)
+
+ -- Julian Taylor <jtaylor@ubuntu.com>  Wed, 02 Oct 2013 19:11:49 +0200
+
 gnome-terminal (3.6.0-0ubuntu1) quantal-proposed; urgency=low
 
   * New upstream release
diff -Nru gnome-terminal-3.6.0/debian/control gnome-terminal-3.6.0/debian/control
--- gnome-terminal-3.6.0/debian/control	2012-09-25 09:26:48.000000000 +0000
+++ gnome-terminal-3.6.0/debian/control	2013-10-10 09:23:11.000000000 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
 XSBC-Original-Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Josselin Mouette <joss@debian.org>
 Standards-Version: 3.9.3
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
diff -Nru gnome-terminal-3.6.0/debian/patches/00_git_fix_geometry_on_focusout.patch gnome-terminal-3.6.0/debian/patches/00_git_fix_geometry_on_focusout.patch
--- gnome-terminal-3.6.0/debian/patches/00_git_fix_geometry_on_focusout.patch	1970-01-01 00:00:00.000000000 +0000
+++ gnome-terminal-3.6.0/debian/patches/00_git_fix_geometry_on_focusout.patch	2013-10-10 09:20:42.000000000 +0000
@@ -0,0 +1,22 @@
+From 611e93f2f8c0c18ed8d365ecb850258e8d5c9c12 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Wed, 16 Jan 2013 21:52:03 +0000
+Subject: window: Use the geometry of the active screen
+
+When we get the restyle on focus-out, the screens call terminal_window_set_size()
+directly. This was causing the window to revert to a previous size, see bug
+https://bugzilla.gnome.org/show_bug.cgi?id=688959 .
+---
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2572,6 +2572,10 @@ terminal_window_set_size_force_grid (Ter
+   int grid_width;
+   int grid_height;
+ 
++  /* Only update the geometry from the active screen. */
++  if (window->priv->active_screen != screen)
++    return;
++
+   /* be sure our geometry is up-to-date */
+   terminal_window_update_geometry (window);
+ 
diff -Nru gnome-terminal-3.6.0/debian/patches/series gnome-terminal-3.6.0/debian/patches/series
--- gnome-terminal-3.6.0/debian/patches/series	2012-09-25 09:26:46.000000000 +0000
+++ gnome-terminal-3.6.0/debian/patches/series	2013-10-10 09:20:42.000000000 +0000
@@ -3,3 +3,4 @@
 03_add_keywords.desktop
 20_add_alt_screen_toggle_ui.patch
 50_add_unity_quicklist.patch
+00_git_fix_geometry_on_focusout.patch