diff --git a/CMakeLists.txt b/CMakeLists.txt
index 766132c..f57ee1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,8 @@
 
 PROJECT(openwsman)
 
-cmake_minimum_required(VERSION 2.4)
+# 2.6 minimum because of CMP0005 (escaping defines)
+cmake_minimum_required(VERSION 2.6)
 
 include(CTest)
 enable_testing()
@@ -13,9 +14,7 @@
 #
 if(COMMAND cmake_policy)
   cmake_policy(SET CMP0003 NEW)
-  # add_definitions escape behavior: old
-  # setting cmp0005 to NEW adds another \" around gcc -D defines
-  cmake_policy(SET CMP0005 OLD)
+  cmake_policy(SET CMP0005 NEW)
   if ( POLICY CMP0042 )
     cmake_policy(SET CMP0042 NEW)
   endif ( POLICY CMP0042 )
@@ -68,11 +67,11 @@
 ENDIF( "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
 SET( WSMANCONF_DIR "${SYSCONFDIR}/openwsman" )
 MESSAGE(STATUS "Configuration will be installed in ${WSMANCONF_DIR}" )
-SET( DEFAULT_CONFIG_FILE "\"${WSMANCONF_DIR}/openwsman.conf\"")
-SET( DEFAULT_CLIENT_CONFIG_FILE "\"${WSMANCONF_DIR}/openwsman_client.conf\"")
-SET( PACKAGE_SUBSCRIPTION_DIR "/var/lib/openwsman/subscriptions" )
-SET( PACKAGE_PLUGIN_DIR "${LIB_INSTALL_DIR}/openwsman/plugins" )
-SET( PACKAGE_AUTH_DIR "${LIB_INSTALL_DIR}/openwsman/authenticators" )
+SET( DEFAULT_CONFIG_FILE \"${WSMANCONF_DIR}/openwsman.conf\")
+SET( DEFAULT_CLIENT_CONFIG_FILE \"${WSMANCONF_DIR}/openwsman_client.conf\")
+SET( PACKAGE_SUBSCRIPTION_DIR /var/lib/openwsman/subscriptions )
+SET( PACKAGE_PLUGIN_DIR ${LIB_INSTALL_DIR}/openwsman/plugins )
+SET( PACKAGE_AUTH_DIR ${LIB_INSTALL_DIR}/openwsman/authenticators )
 
 
 # Macro for error message when header files not present, but build option
diff --git a/ChangeLog b/ChangeLog
index f79d6a2..b97094a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2.6.7
+- Features
+  - Build with CMake 2.6 or later
+- Bugfixes
+  - fix return value check for SSL_CTX_set_cipher_list()
+  - fix pam config for local install
+
 2.6.6
 - Features
   - Support OpenSSL 1.1.0 API
diff --git a/etc/pam/openwsman b/etc/pam/openwsman
index b3785aa..015573d 100644
--- a/etc/pam/openwsman
+++ b/etc/pam/openwsman
@@ -1,7 +1,7 @@
 #%PAM-1.0
-auth       required	pam_unix2.so	nullok
+auth       required	pam_unix.so	nullok
 auth       required	pam_nologin.so
-account    required	pam_unix2.so
-password   required	pam_pwcheck.so	nullok
-password   required	pam_unix2.so	nullok use_first_pass use_authtok
-session    required	pam_unix2.so	none
+account    required	pam_unix.so
+password   required	pam_cracklib.so	nullok
+password   required	pam_unix.so	nullok use_first_pass use_authtok nis shadow
+session    required	pam_unix.so	none
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index b35dba3..8243ee7 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -8,7 +8,7 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
 
-ADD_DEFINITIONS( -DPACKAGE_PLUGIN_DIR="\\\"${PACKAGE_PLUGIN_DIR}\\\"" )
+ADD_DEFINITIONS( -DPACKAGE_PLUGIN_DIR="${PACKAGE_PLUGIN_DIR}" )
 
 SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${XML_CFLAGS} -g -DIGNORE_DUPLICATE_ID" )
 
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 3354005..68cb6ae 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -18,12 +18,12 @@
 
 MESSAGE(STATUS "SSL_LIB is at >${SSL_LIB}<")
 
-ADD_DEFINITIONS(-DDELIM_CHARS="\\\", \\\"" )
+ADD_DEFINITIONS(-DDELIM_CHARS=", " )
 ADD_DEFINITIONS(-DEMBEDDED -DNO_CGI -DNO_SSI )
-ADD_DEFINITIONS(-DSSL_LIB="\\\"${SSL_LIB}\\\"")
-ADD_DEFINITIONS(-DPACKAGE_PLUGIN_DIR="\\\"${PACKAGE_PLUGIN_DIR}\\\"")
-ADD_DEFINITIONS(-DPACKAGE_AUTH_DIR="\\\"${PACKAGE_AUTH_DIR}\\\"")
-ADD_DEFINITIONS(-DPACKAGE_SUBSCRIPTION_DIR="\\\"${PACKAGE_SUBSCRIPTION_DIR}\\\"")
+ADD_DEFINITIONS(-DSSL_LIB="${SSL_LIB}")
+ADD_DEFINITIONS(-DPACKAGE_PLUGIN_DIR="${PACKAGE_PLUGIN_DIR}")
+ADD_DEFINITIONS(-DPACKAGE_AUTH_DIR="${PACKAGE_AUTH_DIR}")
+ADD_DEFINITIONS(-DPACKAGE_SUBSCRIPTION_DIR="${PACKAGE_SUBSCRIPTION_DIR}")
 
 ADD_EXECUTABLE(openwsmand ${openwsmand_SOURCES})
 TARGET_LINK_LIBRARIES(openwsmand wsman_server wsman ${LIBXML2_LIBRARIES})