diff --git a/ChangeLog b/ChangeLog
index 3739dd6e4e16c74194d0823bc9e472ee1cc941be..25ada286019eee36fc900ae7d45241cd76f6f6db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-20  Niels Möller  <nisse@lysator.liu.se>
+
+	* configure.ac: Check for secure_getenv function.
+
 2015-01-19  Niels Möller  <nisse@lysator.liu.se>
 
 	* configure.ac: Fat library setup for arm.
diff --git a/configure.ac b/configure.ac
index 4c0f31575219650c6771038602c6389a2da5857f..7b2690d93d472c29c05dbc08a633ce3212f12b5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -684,8 +684,9 @@ AC_CHECK_HEADERS([valgrind/memcheck.h])
 
 LSH_FUNC_ALLOCA
 LSH_FUNC_STRERROR
-# Used in the testsuite
-AC_CHECK_FUNCS(getline)
+# getenv_secure is used for fat overrides,
+# getline is used in the testsuite
+AC_CHECK_FUNCS(secure_getenv getline)
 AC_C_BIGENDIAN
 
 LSH_GCC_ATTRIBUTES