diff --git a/cmake/modules/FindLibical.cmake b/cmake/modules/FindLibical.cmake
index 4afa7b302..de76da7e3 100644
--- a/cmake/modules/FindLibical.cmake
+++ b/cmake/modules/FindLibical.cmake
@@ -1,86 +1,81 @@
 # Find Libical
 #
 #  LIBICAL_FOUND - system has Libical with the minimum version needed
 #  LIBICAL_INCLUDE_DIRS - the Libical include directories
 #  LIBICAL_LIBRARIES - The libraries needed to use Libical
 #  LIBICAL_VERSION = The value of ICAL_VERSION defined in ical.h
 
 # Copyright (c) 2008, Allen Winter <winter@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 if(NOT LIBICAL_MIN_VERSION)
   set(LIBICAL_MIN_VERSION "0.33")
 endif(NOT LIBICAL_MIN_VERSION)
 
 if (WIN32)
   file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
-  string(REPLACE "\\" "/" _program_FILES_DIR "${_program_FILES_DIR}")
 endif(WIN32)
 
 set(LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
 if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
   # Already in cache, be silent
   set(LIBICAL_FIND_QUIETLY TRUE)
 
 endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
 #set the root from the LIBICAL_BASE environment
-string(REPLACE "\\" "/" libical_root "$ENV{LIBICAL_BASE}")
+file(TO_CMAKE_PATH "$ENV{LIBICAL_BASE}" libical_root )
 #override the root from LIBICAL_BASE defined to cmake
 if(DEFINED LIBICAL_BASE)
-  string(REPLACE "\\" "/" libical_root ${LIBICAL_BASE})
+  file(TO_CMAKE_PATH "${LIBICAL_BASE}" libical_root )
 endif(DEFINED LIBICAL_BASE)
 
-find_path(LIBICAL_INCLUDE_DIRS NAMES ical.h
-  PATH_SUFFIXES libical
-  PATHS ${libical_root}/include ${_program_FILES_DIR}/libical/include /usr/local/include /usr/include ${KDE4_INCLUDE_DIR}
-  NO_CMAKE_SYSTEM_PATH
+find_path(LIBICAL_INCLUDE_DIRS NAMES libical/ical.h
+  HINTS ${libical_root}/include ${_program_FILES_DIR}/libical/include ${KDE4_INCLUDE_DIR}
 )
 
 find_library(LIBICAL_LIBRARY NAMES ical libical
-  PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib ${KDE4_LIB_DIR}
-  NO_CMAKE_SYSTEM_PATH
+  HINTS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib ${KDE4_LIB_DIR}
 )
 find_library(LIBICALSS_LIBRARY NAMES icalss libicalss
-  PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib ${KDE4_LIB_DIR}
-  NO_CMAKE_SYSTEM_PATH
+  HINTS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib ${KDE4_LIB_DIR}
 )
 set(LIBICAL_LIBRARIES ${LIBICAL_LIBRARY} ${LIBICALSS_LIBRARY})
 
 if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
   set(FIND_LIBICAL_VERSION_SOURCE
     "#include <libical/ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
   set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx)
   file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}")
 
   set(FIND_LIBICAL_VERSION_ADD_INCLUDES
     "-DINCLUDE_DIRECTORIES:STRING=${LIBICAL_INCLUDE_DIRS}")
 
   try_run(RUN_RESULT COMPILE_RESULT
     ${CMAKE_BINARY_DIR}
     ${FIND_LIBICAL_VERSION_SOURCE_FILE}
     CMAKE_FLAGS "${FIND_LIBICAL_VERSION_ADD_INCLUDES}"
     RUN_OUTPUT_VARIABLE LIBICAL_VERSION)
 
   if(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
     message(STATUS "Found Libical version ${LIBICAL_VERSION}")
     macro_ensure_version(${LIBICAL_MIN_VERSION} ${LIBICAL_VERSION} LIBICAL_VERSION_OK)
     if(NOT LIBICAL_VERSION_OK)
       message(STATUS "Libcal version ${LIBICAL_VERSION} is too old. At least version ${LIBICAL_MIN_VERSION} is needed.")
       set(LIBICAL_INCLUDE_DIRS "")
       set(LIBICAL_LIBRARIES "")
     endif(NOT LIBICAL_VERSION_OK)
   else(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
     message(FATAL_ERROR "Unable to compile or run the libical version detection program.")
   endif(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
 
 endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIRS)
 
 mark_as_advanced(LIBICAL_INCLUDE_DIRS LIBICAL_LIBRARIES)