diff --git a/tdm/ConfigureChecks.cmake b/tdm/ConfigureChecks.cmake
index 162a8a6ba..cb333aa61 100644
--- a/tdm/ConfigureChecks.cmake
+++ b/tdm/ConfigureChecks.cmake
@@ -85,7 +85,7 @@ unset( BSD_UTMP )
 if( NOT HAVE_UTMPX )
     check_function_exists( getutent have_getutent )
     if( NOT have_getutent )
-        set( BSD_UTMP 1 )
+        set( BSD_UTMP 1 CACHE INTERNAL "" FORCE )
     endif( )
 endif( )
 
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 5ff8d5516..cb38599c1 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -71,7 +71,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <fcntl.h>
 #include <sys/types.h>
 #include <utmp.h>
+#ifdef HAVE_UTMPX
 #include <utmpx.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>