diff --git a/CMakeLists.txt b/CMakeLists.txt
index c56b050e..e0fba512 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,6 @@ SET(DEFAULT_CHARSET_HOME "${CMAKE_INSTALL_PREFIX}")
 SET(PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/plugin")
 
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/SearchLibrary.cmake)
-INCLUDE(CMakePackageConfigHelpers)
 
 IF(WITH_EXTERNAL_ZLIB)
   FIND_PACKAGE(ZLIB QUIET)
@@ -196,11 +195,11 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unittest)
   ADD_SUBDIRECTORY(unittest/libmariadb)
 ENDIF()
 
-IF(BUILD_DOCS)
-  ADD_SUBDIRECTORY(docs)
+IF(CLIENT_DOCS)
+  INSTALL(DIRECTORY ${CLIENT_DOCS}
+  DESTINATION .)
 ENDIF()
 
-
 IF(MSVC)
  SET(CMAKE_INSTALL_PREFIX "")
 ENDIF()
@@ -254,3 +253,16 @@ ELSE()
   SET(CPACK_SOURCE_GENERATOR "TGZ")
 ENDIF()
 INCLUDE(CPack)
+
+MESSAGE(STATUS "MariaDB Connector/c configuration:")
+MESSAGE(STATUS "CPack generation: ${CPACK_GENERATOR}")
+IF(CLIENT_DOCS)
+  MESSAGE(STATUS "Documentation included from ${CLIENT_DOCS}")
+ENDIF()
+MESSAGE(STATUS "SSL support: ${WITH_OPENSSL}")
+MESSAGE(STATUS "Experimental Sqlite support: ${WITH_SQLITE}")
+IF(WITH_EXTERNAL_ZLIB)
+  MESSAGE(STATUS "Zlib support: ${WITH_EXTERNAL_ZLIB}")
+ELSE()
+  MESSAGE(STATUS "Zlib support: yes (using bundled zlib)")
+ENDIF()
diff --git a/unittest/libmariadb/ssl.c.in b/unittest/libmariadb/ssl.c.in
index dc20c479..989c88f3 100644
--- a/unittest/libmariadb/ssl.c.in
+++ b/unittest/libmariadb/ssl.c.in
@@ -600,7 +600,6 @@ int main(int argc, char **argv)
   if (argc > 1)
     get_options(argc, argv);
 
-
   run_tests(my_tests);
 
   mysql_server_end();