diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bcf3c67a8b2..042d9464803 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-27  Sam Steingold  <sds@gnu.org>
+
+	* midnight.el (clean-buffer-list-kill-never-buffer-names): Remove
+	"*server*" which is never created by emacs server.
+
 2011-01-27  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
 
 	* vc/vc-bzr.el (vc-bzr-diff): Don't pass --diff-options unless
diff --git a/lisp/midnight.el b/lisp/midnight.el
index 86092eda9ef..9a6b162e986 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -125,7 +125,7 @@ See also `clean-buffer-list-kill-regexps',
   :group 'midnight)
 
 (defcustom clean-buffer-list-kill-never-buffer-names
-    '("*scratch*" "*Messages*" "*server*")
+    '("*scratch*" "*Messages*")
   "List of buffer names which will never be killed by `clean-buffer-list'.
 See also `clean-buffer-list-kill-never-regexps'.
 Note that this does override `clean-buffer-list-kill-regexps' and