diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index afbca4c3118..c707a4b97bd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,7 @@
 	pop-up-windows is unset.  Add a reuse-window specifier for the
 	case popping up a new window fails.
 	(special-display-popup-frame): Remove double quoting.
+	(display-buffer-normalize-specifiers-1): Fix thinko.
 
 2011-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/window.el b/lisp/window.el
index 67a80a6a2ec..211d8573e0c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5009,7 +5009,8 @@ argument of `display-buffer'."
       ;; A macro specifier.
       (cdr entry))
      ((or (display-buffer-other-window-means-other-frame buffer-name label)
-	  (with-no-warnings (not pop-up-frames)))
+	  (with-no-warnings pop-up-frames))
+      ;; Pop up another frame.
       (cdr (assq 'other-frame display-buffer-macro-specifiers)))
      (t
       ;; In any other case pop up a new window.