diff --git a/ChangeLog b/ChangeLog
index c53cc94f73bf3fdedf5e37b28bbf6e96d549bd24..0e16bd9909657ec1c32d7ead05184b6c951ca513 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-01-04  Niels Möller  <nisse@lysator.liu.se>
 
+	* configure.ac: Check for valgrind/memcheck.h.
+
 	* testsuite/Makefile.in (VALGRIND): Added --partial-loads-ok=yes,
 	needed for the way unaligned data is handled in, e.g., memxor.
 
diff --git a/configure.ac b/configure.ac
index acfc59cd9a2850f7d44859c024be5a7b1252df14..d78bcb0ec3c1227e98236bf17bad24b2b7211324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -638,6 +638,8 @@ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h
 [enable_openssl=no
  break])
 
+AC_CHECK_HEADERS([valgrind/memcheck.h])
+
 LSH_FUNC_ALLOCA
 LSH_FUNC_STRERROR