diff --git a/src/ChangeLog b/src/ChangeLog
index 56c7a148416ba1a17f254ee43b9aa29db256b4d8..3c50cbb1d03baf6756c8e6370607813c2988668b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* process.c: Use the same condition for POLL_FOR_INPUT in both
+	keyboard.c and process.c (bug#1858).
+
 2011-07-09  Lawrence Mitchell  <wence@gmx.li>
 
 	* gnutls.c (Qgnutls_bootprop_min_prime_bits): New variable.
diff --git a/src/process.c b/src/process.c
index 1a884357b867f53623e762553197e4ee3f36bbf5..236c27e5c3a08897e9043a3504ed25cb03c6419b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -245,7 +245,7 @@ static void create_pty (Lisp_Object);
 
 /* If we support a window system, turn on the code to poll periodically
    to detect C-g.  It isn't actually used when doing interrupt input.  */
-#ifdef HAVE_WINDOW_SYSTEM
+#if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS)
 #define POLL_FOR_INPUT
 #endif