diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6abdf4057..4f431fc92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,11 @@ SET( CMAKE_MODULE_PATH
 INCLUDE(ZyppCommon)
 INCLUDE(CMakePushCheckState)
 
+# use Boost's config file
+if(POLICY CMP0167)
+  cmake_policy(SET CMP0167 NEW)
+endif()
+
 # allow name libraries by name mixed with full
 # paths
 if(COMMAND cmake_policy)
@@ -151,7 +156,6 @@ SET( LIBZYPP_SOVERSION_INFO "${LIBZYPP_SO_FIRST}" )
 
 GENERATE_PACKAGING(${PACKAGE} ${VERSION})
 
-INCLUDE(CPack)
 ####################################################################
 FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options unit_test_framework thread)
 IF (Boost_FOUND)
diff --git a/cmake/modules/Findlibproxy.cmake b/cmake/modules/Findlibproxy.cmake
index b6d945446..1fcb88498 100644
--- a/cmake/modules/Findlibproxy.cmake
+++ b/cmake/modules/Findlibproxy.cmake
@@ -2,6 +2,8 @@
 # alternatives like the PacRunner replacement which *just* queries PacRunner
 # directly will only provide a .pc file. So use pkg-config to find it...
 
-INCLUDE ( FindPkgConfig )
+if(NOT PKG_CONFIG_FOUND)
+  include(FindPkgConfig)
+endif()
 
 PKG_CHECK_MODULES( LIBPROXY libproxy-1.0 )
diff --git a/cmake/modules/ZyppCommon.cmake b/cmake/modules/ZyppCommon.cmake
index a697107d7..46b5f7a34 100644
--- a/cmake/modules/ZyppCommon.cmake
+++ b/cmake/modules/ZyppCommon.cmake
@@ -110,13 +110,7 @@ MACRO(GENERATE_PACKAGING PACKAGE VERSION)
   "Makefile\\\\.in$"
   )
 
-  #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Novell's package management core engine.")
-  SET(CPACK_PACKAGE_VENDOR "Novell Inc.")
-  #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
-  #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
-  #SET(CPACK_PACKAGE_VERSION_MAJOR ${version_major})
-  #SET(CPACK_PACKAGE_VERSION_MINOR ${version_minor})
-  #SET(CPACK_PACKAGE_VERSION_PATCH ${version_patch})
+  SET(CPACK_PACKAGE_VENDOR "SUSE LLC")
   SET( CPACK_GENERATOR "TBZ2")
   SET( CPACK_SOURCE_GENERATOR "TBZ2")
   SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" )