diff -ur gnome-terminal-3.11.0.orig/configure.ac gnome-terminal-3.11.0/configure.ac
--- gnome-terminal-3.11.0.orig/configure.ac	2013-11-20 23:44:25.000000000 +0100
+++ gnome-terminal-3.11.0/configure.ac	2013-12-16 16:22:10.179874631 +0100
@@ -56,7 +56,7 @@
   3.0) GTK_API_VERSION=3.0
        GTK_REQUIRED=3.9.9
        VTE_PC_VERSION=-2.90
-       VTE_REQUIRED=0.35.0
+       VTE_REQUIRED=0.35.1
        ;;
 esac
 
diff -ur gnome-terminal-3.11.0.orig/src/org.gnome.Terminal.gschema.xml gnome-terminal-3.11.0/src/org.gnome.Terminal.gschema.xml
--- gnome-terminal-3.11.0.orig/src/org.gnome.Terminal.gschema.xml	2013-11-20 23:44:25.000000000 +0100
+++ gnome-terminal-3.11.0/src/org.gnome.Terminal.gschema.xml	2013-12-16 16:20:21.579870128 +0100
@@ -248,6 +248,10 @@
       <default>true</default>
       <summary>Whether to use the system monospace font</summary>
     </key>
+    <key name="rewrap-on-resize" type="b">
+      <default>true</default>
+      <_summary>Whether to rewrap the terminal's contents on window resize</_summary>
+    </key>
     <key name="encoding" type="s">
       <choices>
         <choice value="current" />
Only in gnome-terminal-3.11.0/src: org.gnome.Terminal.gschema.xml.orig
diff -ur gnome-terminal-3.11.0.orig/src/profile-editor.c gnome-terminal-3.11.0/src/profile-editor.c
--- gnome-terminal-3.11.0.orig/src/profile-editor.c	2013-11-20 23:44:25.000000000 +0100
+++ gnome-terminal-3.11.0/src/profile-editor.c	2013-12-16 16:20:21.579870128 +0100
@@ -991,6 +991,10 @@
                             gtk_builder_get_object (builder, "palette-box"),
                             "sensitive",
                             FALSE);
+  g_settings_bind (profile,
+                   TERMINAL_PROFILE_REWRAP_ON_RESIZE_KEY,
+                   gtk_builder_get_object (builder, "rewrap-on-resize-checkbutton"),
+                   "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
 
   terminal_util_bind_mnemonic_label_sensitivity (editor);
 
diff -ur gnome-terminal-3.11.0.orig/src/profile-preferences.ui gnome-terminal-3.11.0/src/profile-preferences.ui
--- gnome-terminal-3.11.0.orig/src/profile-preferences.ui	2013-11-20 23:44:25.000000000 +0100
+++ gnome-terminal-3.11.0/src/profile-preferences.ui	2013-12-16 16:20:21.583870129 +0100
@@ -560,6 +560,22 @@
                     <property name="position">9</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkCheckButton" id="rewrap-on-resize-checkbutton">
+                    <property name="label" translatable="yes">_Rewrap on resize</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">10</property>
+                  </packing>
+                </child>
               </object>
             </child>
             <child type="tab">
Only in gnome-terminal-3.11.0/src: profile-preferences.ui.orig
diff -ur gnome-terminal-3.11.0.orig/src/terminal-schemas.h gnome-terminal-3.11.0/src/terminal-schemas.h
--- gnome-terminal-3.11.0.orig/src/terminal-schemas.h	2013-11-20 23:44:26.000000000 +0100
+++ gnome-terminal-3.11.0/src/terminal-schemas.h	2013-12-16 16:20:21.583870129 +0100
@@ -49,6 +49,7 @@
 #define TERMINAL_PROFILE_LOGIN_SHELL_KEY                "login-shell"
 #define TERMINAL_PROFILE_NAME_KEY                       "name"
 #define TERMINAL_PROFILE_PALETTE_KEY                    "palette"
+#define TERMINAL_PROFILE_REWRAP_ON_RESIZE_KEY           "rewrap-on-resize"
 #define TERMINAL_PROFILE_SCROLLBACK_LINES_KEY           "scrollback-lines"
 #define TERMINAL_PROFILE_SCROLLBACK_UNLIMITED_KEY       "scrollback-unlimited"
 #define TERMINAL_PROFILE_SCROLLBAR_POLICY_KEY           "scrollbar-policy"
diff -ur gnome-terminal-3.11.0.orig/src/terminal-screen.c gnome-terminal-3.11.0/src/terminal-screen.c
--- gnome-terminal-3.11.0.orig/src/terminal-screen.c	2013-11-20 23:44:26.000000000 +0100
+++ gnome-terminal-3.11.0/src/terminal-screen.c	2013-12-16 16:20:21.583870129 +0100
@@ -820,6 +820,10 @@
     vte_terminal_set_cursor_shape (vte_terminal,
                                    g_settings_get_enum (priv->profile, TERMINAL_PROFILE_CURSOR_SHAPE_KEY));
 
+  if (!prop_name || prop_name == I_(TERMINAL_PROFILE_REWRAP_ON_RESIZE_KEY))
+    vte_terminal_set_rewrap_on_resize (vte_terminal,
+                                       g_settings_get_boolean (profile, TERMINAL_PROFILE_REWRAP_ON_RESIZE_KEY));
+
   g_object_thaw_notify (object);
 }
 
Only in gnome-terminal-3.11.0/src: terminal-screen.c.orig
