diff --git a/ChangeLog b/ChangeLog
index 33fde3f7..4acc07b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,7 @@ Changes in current version:
  o Allow regression code to build even without Python installed
  o remove NDEBUG ifdefs from evdns.c
  o detect integer types properly on platforms without stdint.h
+ o udpate documentation of event_loop and event_base_loop; from Tani Hosokawa.
 
 	
 Changes in 1.4.0:
diff --git a/event.h b/event.h
index 97ab6a74..aade3bfb 100644
--- a/event.h
+++ b/event.h
@@ -368,7 +368,8 @@ int event_base_set(struct event_base *, struct event *);
   This is a more flexible version of event_dispatch().
 
   @param flags any combination of EVLOOP_ONCE | EVLOOP_NONBLOCK
-  @return 0 if successful, or -1 if an error occurred
+  @return 0 if successful, -1 if an error occurred, or 1 if no events were
+    registered.
   @see event_loopexit(), event_base_loop()
 */
 int event_loop(int);
@@ -380,7 +381,8 @@ int event_loop(int);
 
   @param eb the event_base structure returned by event_init()
   @param flags any combination of EVLOOP_ONCE | EVLOOP_NONBLOCK
-  @return 0 if successful, or -1 if an error occurred
+  @return 0 if successful, -1 if an error occurred, or 1 if no events were
+    registered.
   @see event_loopexit(), event_base_loop()
   */
 int event_base_loop(struct event_base *, int);