diff --git a/src/ChangeLog b/src/ChangeLog
index c0b9039c339..d6de89a9d50 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* window.c (Fwindow_body_width): Doc fix.  (Bug#19395)
+
 2014-12-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.
diff --git a/src/window.c b/src/window.c
index 6938ffb8cb8..ccd714ae12e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -973,7 +973,10 @@ or scroll bars.
 If PIXELWISE is nil, return the largest integer smaller than WINDOW's
 pixel width divided by the character width of WINDOW's frame.  This
 means that if a column at the right of the text area is only partially
-visible, that column is not counted.  */)
+visible, that column is not counted.
+
+Note that the returned value includes the column reserved for the
+continuation glyph.  */)
   (Lisp_Object window, Lisp_Object pixelwise)
 {
   return make_number (window_body_width (decode_live_window (window),