diff --git a/cachedb/cachedb.c b/cachedb/cachedb.c
index 0c710c6c8..7eb0df434 100644
--- a/cachedb/cachedb.c
+++ b/cachedb/cachedb.c
@@ -57,6 +57,21 @@
 #include "sldns/wire2str.h"
 #include "sldns/sbuffer.h"
 
+/* header file for htobe64 */
+#ifdef HAVE_ENDIAN_H
+#  include <endian.h>
+#endif
+#ifdef HAVE_SYS_ENDIAN_H
+#  include <sys/endian.h>
+#endif
+#ifdef HAVE_LIBKERN_OSBYTEORDER_H
+/* In practice this is specific to MacOS X.  We assume it doesn't have
+* htobe64/be64toh but has alternatives with a different name. */
+#  include <libkern/OSByteOrder.h>
+#  define htobe64(x) OSSwapHostToBigInt64(x)
+#  define be64toh(x) OSSwapBigToHostInt64(x)
+#endif
+
 /** the unit test testframe for cachedb, its module state contains
  * a cache for a couple queries (in memory). */
 struct testframe_moddata {
diff --git a/cachedb/redis.c b/cachedb/redis.c
index fa5528c56..3dfbf8f7a 100644
--- a/cachedb/redis.c
+++ b/cachedb/redis.c
@@ -48,21 +48,6 @@
 #include "util/config_file.h"
 #include "sldns/sbuffer.h"
 
-/* header file for htobe64 */
-#ifdef HAVE_ENDIAN_H
-#  include <endian.h>
-#endif
-#ifdef HAVE_SYS_ENDIAN_H
-#  include <sys/endian.h>
-#endif
-#ifdef HAVE_LIBKERN_OSBYTEORDER_H
-/* In practice this is specific to MacOS X.  We assume it doesn't have
-* htobe64/be64toh but has alternatives with a different name. */
-#  include <libkern/OSByteOrder.h>
-#  define htobe64(x) OSSwapHostToBigInt64(x)
-#  define be64toh(x) OSSwapBigToHostInt64(x)
-#endif
-
 #ifdef USE_REDIS
 #include "hiredis/hiredis.h"
 
diff --git a/doc/Changelog b/doc/Changelog
index 478f12c23..24f90c753 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,9 @@
+16 March 2018: Wouter
+	- corrected a minor typo in the changelog.
+	- move htobe64/be64toh portability code to cachedb.c.
+
 15 March 2018: Wouter
-	- Add --with-libhiredis, unbound support for a new cached backend
+	- Add --with-libhiredis, unbound support for a new cachedb backend
 	  that uses a Redis server as the storage.  This implementation
 	  depends on the hiredis client library (https://redislabs.com/lp/hiredis/).
 	  And unbound should be built with both --enable-cachedb and