diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index cfb6a8d7..659ed0f9 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -144,10 +144,12 @@ if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOO
 
   # check for various GPGME features
   tde_save( CMAKE_CXX_FLAGS )
+  tde_save( CMAKE_REQUIRED_INCLUDES )
   tde_save( CMAKE_REQUIRED_LIBRARIES )
   string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
   # See FIXME above regarding -D_FILE_OFFSET_BITS=64
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GPGME_INCLUDE_DIRS} -D_FILE_OFFSET_BITS=64")
+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
+  set( CMAKE_REQUIRED_INCLUDES "${GPGME_INCLUDE_DIRS}")
   set( CMAKE_REQUIRED_LIBRARIES "${GPGME_LIBRARIES}")
 
   # check for GPGME_KEYLIST_MODE_VALIDATE
@@ -206,6 +208,7 @@ if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOO
 
   # done checking for GPGME features
   tde_restore( CMAKE_CXX_FLAGS )
+  tde_restore( CMAKE_REQUIRED_INCLUDES )
   tde_restore( CMAKE_REQUIRED_LIBRARIES )
 
 endif( )