diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43c5bfc..2156301 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-24  enami tsugutomo  <tsugutomo.enami@jp.sony.com>
+
+	* nnimap.el (nnimap-wait-for-response): Ignore NOOP response requested
+	to keep connection open.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
 	* Merge in all changes up to 24.4 release.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index ad48d47..7992151 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1888,7 +1888,7 @@ Return the server's response to the SELECT or EXAMINE command."
 			(while (and (not (bobp))
 				    (progn
 				      (forward-line -1)
-				      (looking-at "\\*"))))
+				      (looking-at "\\*\\|[0-9]+ OK NOOP"))))
 			(not (looking-at (format "%d .*\n" sequence)))))
 	    (when messagep
 	      (nnheader-message-maybe