diff --git a/configure.ac b/configure.ac
index 90065e9ba..2e3409bc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,10 +522,12 @@ AC_STRUCT_DIRENT_D_TYPE
 
 AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp fwprintf )
 AC_CHECK_FUNCS( futimes wcwidth wcswidth wcstok fputwc fgetwc )
-AC_CHECK_FUNCS( wcstol wcslcat wcslcpy lrand48_r killpg mkostemp )
+AC_CHECK_FUNCS( wcstol wcslcat wcslcpy lrand48_r killpg )
 AC_CHECK_FUNCS( backtrace backtrace_symbols_fd sysconf getifaddrs )
 AC_CHECK_FUNCS( futimens clock_gettime )
 
+AC_CHECK_DECL( [mkostemp], [ AC_CHECK_FUNCS([mkostemp]) ] )
+
 if test x$local_gettext != xno; then
   AC_CHECK_FUNCS( gettext dcgettext )