diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 63df149..b4ba4da 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -35,5 +35,13 @@ find_library( HAVE_LIBTDELDAP tdeldap )
 if( HAVE_LIBTDELDAP )
   set( LIBTDELDAP_LIBRARIES "tdeldap" )
   else()
-     tde_message_fatal( "libtdeldap is requested, but was not found on your system" )
+     tde_message_fatal( "libtdeldap is required, but was not found on your system" )
+endif( )
+
+
+##### check for krb5
+
+pkg_search_module( KRB5 krb5 )
+if( NOT KRB5_FOUND)
+  tde_message_fatal( "krb5 library is required but not found on your system" )
 endif( )
diff --git a/cert-updater/CMakeLists.txt b/cert-updater/CMakeLists.txt
index 8def08e..b93fc2b 100644
--- a/cert-updater/CMakeLists.txt
+++ b/cert-updater/CMakeLists.txt
@@ -2,8 +2,10 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}/tde
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${KRB5_INCLUDE_DIRS}
 )
 
 link_directories(
diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt
index c9f17ac..ce93eb2 100644
--- a/cmdline/CMakeLists.txt
+++ b/cmdline/CMakeLists.txt
@@ -2,8 +2,10 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}/tde
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${KRB5_INCLUDE_DIRS}
 )
 
 link_directories(
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 18a7fcd..3c25e30 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,8 +2,10 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}/tde
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${KRB5_INCLUDE_DIRS}
 )
 
 link_directories(