diff --git a/CHANGES b/CHANGES
index 02fc6821101..0adbfd547be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) core: adding defines to allow interworking with honggfuzz without
+     further patches. [Stefan Eissing, Robert Swiecki]
+
   *) mod_slotmem_shm: Add generation number to shm filename to fix races
      with graceful restarts. PR 62044.
 
diff --git a/server/main.c b/server/main.c
index d0f6b3f808f..cd12521229e 100644
--- a/server/main.c
+++ b/server/main.c
@@ -484,7 +484,11 @@ static void usage(process_rec *process)
     destroy_and_exit_process(process, 1);
 }
 
-int main(int argc, const char * const argv[])
+#ifdef HFND_FUZZING_ENTRY_FUNCTION
+ HFND_FUZZING_ENTRY_FUNCTION(int argc, const char *const *argv)
+#else
+ int main(int argc, const char *const *argv)
+#endif
 {
     char c;
     int showcompile = 0, showdirectives = 0;