diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b16a4c575a..eb1f5d22829 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-30  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (display-buffer--action-function-custom-type): Fix
+	entry.
+
 2012-04-27  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-defs.el (c-version): Update to 5.32.3.
diff --git a/lisp/window.el b/lisp/window.el
index 7abe3fbfe7f..49f84960078 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4607,7 +4607,7 @@ The actual non-nil value of this variable will be copied to the
   '(choice :tag "Function"
 	   (const :tag "--" ignore) ; default for insertion
 	   (const display-buffer-reuse-window)
-	   (const display-buffer-use-some-window)
+	   (const display-buffer-pop-up-window)
 	   (const display-buffer-same-window)
 	   (const display-buffer-pop-up-frame)
 	   (const display-buffer-use-some-window)