diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 696e6e1eedc..9c7ba8541df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* window.el (shrink-window): Mention the `window-min-height'
+	variable in the doc string.
+
 2012-04-05  Bastien Guerry  <bzg@altern.org>
 
 	* color.el (color-lighten-name): Fix typo.
diff --git a/lisp/window.el b/lisp/window.el
index 42bc57272bb..c9e2469b0d2 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2117,6 +2117,7 @@ Interactively, if no argument is given, make the selected window
 one line smaller.  If optional argument HORIZONTAL is non-nil,
 make selected window narrower by DELTA columns.  If DELTA is
 negative, enlarge selected window by -DELTA lines or columns.
+Also see the `window-min-height' variable.
 Return nil."
   (interactive "p")
   (cond