diff --git a/configure.ac b/configure.ac
index 6c19eede..c82b4650 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ LT_LIB_DLLOAD
 dnl Checks for libraries.
 
 dnl Checks for header files.
-AC_CHECK_HEADERS(crypt.h utmp.h \
+AC_CHECK_HEADERS(utmp.h \
 	termio.h sgtty.h sys/ioctl.h paths.h \
 	sys/capability.h sys/random.h \
 	gshadow.h lastlog.h rpc/key_prot.h acl/libacl.h \
diff --git a/lib/defines.h b/lib/defines.h
index 5f9ed4d1..89300c93 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -41,7 +41,7 @@
  * crypt(3), crypt_gensalt(3), and their
  * feature test macros may be defined in here.
  */
-#if HAVE_CRYPT_H
+#if __has_include(<crypt.h>)
 # include <crypt.h>
 #endif