diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 21ec42001..6a3c001da 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -54,6 +54,18 @@ if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_TDM) )
 endif( )
 
 
+# crypt
+set( CRYPT_LIBRARY crypt )
+check_library_exists( ${CRYPT_LIBRARY} crypt "" HAVE_CRYPT )
+if( NOT HAVE_CRYPT )
+  unset( CRYPT_LIBRARY )
+  check_function_exists( crypt LIBC_HAVE_CRYPT )
+  if( LIBC_HAVE_CRYPT )
+    set( HAVE_CRYPT 1 CACHE INTERNAL "" FORCE )
+  endif( LIBC_HAVE_CRYPT )
+endif( NOT HAVE_CRYPT )
+
+
 # hal (ksmserver, tdeioslaves)
 if( WITH_HAL )
   pkg_search_module( HAL hal )
diff --git a/kcheckpass/ConfigureChecks.cmake b/kcheckpass/ConfigureChecks.cmake
index 120869dac..d6d62f55b 100644
--- a/kcheckpass/ConfigureChecks.cmake
+++ b/kcheckpass/ConfigureChecks.cmake
@@ -9,8 +9,6 @@
 #
 #################################################
 
-find_library( CRYPT_LIBRARY crypt )
-
 if( WITH_PAM AND (NOT DEFINED KCHECKPASS_PAM_SERVICE) )
   set( KCHECKPASS_PAM_SERVICE "kde" CACHE INTERNAL "" )
 endif( )
diff --git a/tdm/ConfigureChecks.cmake b/tdm/ConfigureChecks.cmake
index ae7ea8b6c..162a8a6ba 100644
--- a/tdm/ConfigureChecks.cmake
+++ b/tdm/ConfigureChecks.cmake
@@ -27,16 +27,6 @@ check_function_exists( login_getclass HAVE_LOGIN_GETCLASS )
 check_function_exists( auth_timeok HAVE_AUTH_TIMEOK )
 tde_restore( CMAKE_REQUIRED_LIBRARIES )
 
-check_function_exists( crypt LIBC_HAVE_CRYPT )
-if( LIBC_HAVE_CRYPT )
-  set( HAVE_CRYPT 1 CACHE INTERNAL "" FORCE )
-else( )
-  check_library_exists( crypt crypt "" HAVE_CRYPT )
-  if( HAVE_CRYPT )
-    set( CRYPT_LIBRARY crypt )
-  endif( )
-endif( )
-
 check_include_file( lastlog.h HAVE_LASTLOG_H )
 check_include_file( termio.h HAVE_TERMIO_H )