diff --git a/ChangeLog b/ChangeLog
index 0222fd11..4a9b652b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Changes in 1.4.3-stable:
  o include Content-Length in reply for HTTP/1.0 requests with keep-alive
  o Patch from Tani Hosokawa: make some functions in http.c threadsafe.
  o Do not free the kqop file descriptor in other processes, also allow it to be 0; from Andrei Nigmatulin
+ o make event_rpcgen.py generate code include event-config.h; reported by Sam Banks.
 
 Changes in 1.4.2-rc:
  o remove pending timeouts on event_base_free()
diff --git a/event_rpcgen.py b/event_rpcgen.py
index 00dc755a..5c6ec8d3 100755
--- a/event_rpcgen.py
+++ b/event_rpcgen.py
@@ -1306,7 +1306,11 @@ def HeaderPreamble(name):
         name, guard, guard)
 
     # insert stdint.h - let's hope everyone has it
-    pre += '#include <stdint.h>\n'
+    pre += (
+        '#include <event-config.h>\n'
+        '#ifdef _EVENT_HAVE_STDINT_H\n'
+        '#include <stdint.h>\n'
+        '#endif\n' )
 
     for statement in headerdirect:
         pre += '%s\n' % statement