diff --git a/src/ChangeLog b/src/ChangeLog
index 99d545cf99b..a056eead1f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,12 @@
 2014-02-07  Martin Rudalics  <rudalics@gmx.at>
 
-	Constrain window box and body sizes (Bug#16649).
+	Constrain window box/body sizes and margin widths (Bug#16649).
 	* xdisp.c (window_box_width): Don't return less than zero.
 	(window_box_left_offset, window_box_right_offset): Don't return
 	more than the window's pixel width.
 	* window.c (window_body_height, window_body_width): Don't return
 	negative value.
+	(window_resize_apply): Adjust margin width, if necessary.
 
 2014-02-07  Glenn Morris  <rgm@gnu.org>
 
diff --git a/src/window.c b/src/window.c
index adde3919699..b2c97d52157 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3923,8 +3923,11 @@ window_resize_apply (struct window *w, bool horflag)
 	}
     }
   else
-    /* Bug#15957.  */
-    w->window_end_valid = 0;
+    {
+      adjust_window_margins (w);
+      /* Bug#15957.  */
+      w->window_end_valid = 0;
+    }
 }