diff --git a/ChangeLog b/ChangeLog
index d42a90ae..2fdb0788 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Changes in current version:
  o free minheap on event_base_free(); from Christopher Layne
  o debug cleanups in signal.c; from Christopher Layne
  o provide event_base_new() that does not set the current_base global	
+ o bufferevent_write now uses a const source argument; report from Charles Kerr
 
 Changes in 1.4.0:
  o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.
diff --git a/evbuffer.c b/evbuffer.c
index f4e839c2..073c8658 100644
--- a/evbuffer.c
+++ b/evbuffer.c
@@ -293,7 +293,7 @@ bufferevent_free(struct bufferevent *bufev)
  */
 
 int
-bufferevent_write(struct bufferevent *bufev, void *data, size_t size)
+bufferevent_write(struct bufferevent *bufev, const void *data, size_t size)
 {
 	int res;
 
diff --git a/event.h b/event.h
index 4dd87338..7a73cd10 100644
--- a/event.h
+++ b/event.h
@@ -796,11 +796,13 @@ void bufferevent_free(struct bufferevent *bufev);
   @return 0 if successful, or -1 if an error occurred
   @see bufferevent_write_buffer()
   */
-int bufferevent_write(struct bufferevent *bufev, void *data, size_t size);
+int bufferevent_write(struct bufferevent *bufev,
+    const void *data, size_t size);
 
 
 /**
-  Write data from an evbuffer to a bufferevent buffer.
+  Write data from an evbuffer to a bufferevent buffer.  The evbuffer is
+  being drained as a result.
 
   @param bufev the bufferevent to be written to
   @param buf the evbuffer to be written