diff --git a/configure b/configure
index b16b900c3..fcb49c2de 100755
--- a/configure
+++ b/configure
@@ -20855,6 +20855,8 @@ if test "${enable_cachedb+set}" = set; then :
   enableval=$enable_cachedb;
 fi
 
+# turn on cachedb when hiredis support is enabled.
+if test "$found_libhiredis" = "yes"; then enable_cachedb="yes"; fi
 case "$enable_cachedb" in
     yes)
 
diff --git a/configure.ac b/configure.ac
index 2ba02602b..11f2ff56c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1489,6 +1489,8 @@ dnsc_DNSCRYPT([
 
 # check for cachedb if requested
 AC_ARG_ENABLE(cachedb, AC_HELP_STRING([--enable-cachedb], [enable cachedb module that can use external cache storage]))
+# turn on cachedb when hiredis support is enabled.
+if test "$found_libhiredis" = "yes"; then enable_cachedb="yes"; fi
 case "$enable_cachedb" in
     yes)
     	AC_DEFINE([USE_CACHEDB], [1], [Define to 1 to use cachedb support])
diff --git a/doc/Changelog b/doc/Changelog
index d9d0f89ee..a4034b714 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+3 May 2018: Wouter
+	- Fix that configure --with-libhiredis also turns on cachedb.
+
 2 May 2018: Wouter
 	- Fix fail to reject dead peers in forward-zone, with ssl-upstream.