diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a0e4461c5781ea530deee73035ea4718cfcae7c..ed796fe93f50b7f3717e24f25c99a3dece669a72 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-05  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (quit-window): Restore prefix argument behavior
+	removed in 2008-10-30 change.  (Bug#1308)
+
 2008-11-05  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* doc-view.el (doc-view-mode): Bugfix: Add conversion killing
diff --git a/lisp/window.el b/lisp/window.el
index 56565a615e1ad63d149fa8ff018695e3f5ab55b7..35b2789cb02464c0e90e38d183045180919f4562 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1420,12 +1420,14 @@ Return non-nil if the window was shrunk, nil otherwise."
 
 (defun quit-window (&optional kill window)
   "Bury or kill (with KILL non-nil) the buffer displayed in WINDOW.
+With a prefix argument, kill the buffer instead.
+
 KILL defaults to nil, WINDOW to the selected window.  If WINDOW
 is dedicated or a minibuffer window, delete it and, if it's the
 only window on its frame, delete its frame as well provided there
 are other frames left.  Otherwise, display some other buffer in
 the window."
-  (interactive)
+  (interactive "P")
   (let* ((window (or window (selected-window)))
 	 (buffer (window-buffer window)))
     (if (or (window-minibuffer-p window) (window-dedicated-p window))