diff --git a/AUTHORS b/AUTHORS
index a441dfa8..8a040965 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -53,6 +53,7 @@ Hani Benhabiles <kroosec@gmail.com>
 Guy Martin <gmsoft@tuxicoman.be>
 Robert Groenenberg <robert.groenenberg@broadforward.com>
 Denis Dowling <denis.dowling@hsd.com.au>
+Louis Benoit <louisbenoit@videotron.ca>
 
 
 Documentation contributions also came from:
diff --git a/ChangeLog b/ChangeLog
index 710e86eb..67aa2115 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 15 00:30:34 CEST 2015
+	Fix looping issue when using MHD_USE_POLL_INTERNALLY
+	and a client times out. -LB
+
 Sun Apr 12 21:48:50 CEST 2015
 	Fix looping issue when combining MHD_USE_EPOLL_LINUX_ONLY
 	with HTTPS and slow clients. -CG
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 93c4c212..69fdd1d9 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -130,7 +130,7 @@ typedef intptr_t ssize_t;
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094004
+#define MHD_VERSION 0x00094005
 
 /**
  * MHD-internal return code for "YES".
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 950b551b..876030b0 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2474,7 +2474,7 @@ MHD_poll_all (struct MHD_Daemon *daemon,
 	    pos->idle_handler (pos);
 	    break;
 	  case MHD_EVENT_LOOP_INFO_CLEANUP:
-	    /* should never happen */
+	    pos->idle_handler (pos);
 	    break;
 	  }
       }