diff --git a/ChangeLog b/ChangeLog
index 919d2b72c..2708827db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ v0.3.9-dev, 2012-07-27
 Version 0.3.9 (under dev!)
 --------------------------
 
+* core: fix names of cache variables in configure.in (bug #36971)
 * core: scroll to bottom of window after reaching first or last highlight with
   keys alt+"p" / alt+"n"
 * core: add hdata "hotlist"
diff --git a/configure.in b/configure.in
index c0129bdb0..a74e1efb0 100644
--- a/configure.in
+++ b/configure.in
@@ -837,7 +837,7 @@ fi
 # ------------------------------------------------------------------------------
 
 enable_flock="no"
-AC_CACHE_CHECK([for flock() support], ac_have_flock, [
+AC_CACHE_CHECK([for flock() support], ac_cv_have_flock, [
 AC_LINK_IFELSE([AC_LANG_PROGRAM(
 [[ #include <sys/file.h>]],
 [[ flock(0, LOCK_SH); ]])],
@@ -866,7 +866,7 @@ fi
 
 enable_backtrace="no"
 if test "x$debug" != "x0" ; then
-    AC_CACHE_CHECK([for execinfo.h and backtrace], ac_have_backtrace, [
+    AC_CACHE_CHECK([for execinfo.h and backtrace], ac_cv_have_backtrace, [
         AC_LINK_IFELSE([AC_LANG_PROGRAM(
             [[ #include <execinfo.h> ]],
             [[ void *trace[128]; int n = backtrace(trace, 128); ]])],
@@ -885,7 +885,7 @@ fi
 # ------------------------------------------------------------------------------
 
 enable_eatnewlineglitch="no"
-AC_CACHE_CHECK([for eat_newline_glitch support], ac_have_eatnewlineglitch, [
+AC_CACHE_CHECK([for eat_newline_glitch support], ac_cv_have_eatnewlineglitch, [
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [[ #include <term.h> ]],
 [[ eat_newline_glitch = 0; ]])],