diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f13eaf843..10cc896414 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,11 @@ project(Wireshark C)
 cmake_minimum_required(VERSION 2.6)
 set(CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
+# Needs to be set after cmake_minimum_required or cmake_policy(VERSION)
+#if(COMMAND cmake_policy)
+#	cmake_policy(SET CMP0015 NEW)
+#endif(COMMAND cmake_policy)
+
 # set(PROJECT_VERSION "1.3.4-rc5")
 # set(PROJECT_VERSION "1.3.4rc5")
 # set(PROJECT_VERSION "1.3.4")
@@ -423,6 +428,10 @@ endif()
 
 configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
 
+# Basedir where to install guides
+set(DOC_DIR "$ENV{docdir}")
+message(STATUS "docdir: ${DOC_DIR}")
+
 include(FeatureSummary)
 #SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
 PRINT_ENABLED_FEATURES()
diff --git a/cmake/modules/FindHtmlViewer.cmake b/cmake/modules/FindHtmlViewer.cmake
index 36d8cf5d58..d96d49ecbf 100644
--- a/cmake/modules/FindHtmlViewer.cmake
+++ b/cmake/modules/FindHtmlViewer.cmake
@@ -14,7 +14,7 @@ FIND_PROGRAM(HTML_VIEWER_EXECUTABLE
     mozilla
     htmlview
     open
-    ENV{HTML_VIEWER}
+    $ENV{HTML_VIEWER}
   PATHS
     ${CYGWIN_INSTALL_PATH}/bin
     /bin