diff --git a/CMakeLists.txt b/CMakeLists.txt
index 531bcb2da4e8433be76f94ce69d8d4f3eb5aa9bd..4b20ab6ec610a0810a6ac390416b3108ae0f55c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -529,19 +529,17 @@ endif(ENABLE_OPTHOM)
 
 
 if(ENABLE_KBIPACK)
+  set_config_option(HAVE_KBIPACK "Kbipack")
+  add_subdirectory(contrib/kbipack)
+  include_directories(contrib/kbipack)
   find_library(GMP_LIB gmp)
   find_path(GMP_INC "gmp.h" PATH_SUFFIXES src include)
   if(GMP_LIB AND GMP_INC)
     set_config_option(HAVE_GMP "GMP")
     list(APPEND EXTERNAL_LIBRARIES ${GMP_LIB})
     list(APPEND EXTERNAL_INCLUDES ${GMP_INC})
-    add_subdirectory(contrib/kbipack)
-    include_directories(contrib/kbipack)
-    set_config_option(HAVE_KBIPACK "Kbipack")
   else(GMP_LIB AND GMP_INC)
-    add_subdirectory(contrib/kbipack)
-    include_directories(contrib/kbipack)
-    set_config_option(HAVE_KBIPACK "Kbipack")
+    message(STATUS "GMP not found: Kbipack uses long int")
   endif(GMP_LIB AND GMP_INC)
 endif(ENABLE_KBIPACK)