diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch
index fd25ce927..e99aeb04f 100644
--- a/dev-util/cmake/patches/cmake-2.8.5.patch
+++ b/dev-util/cmake/patches/cmake-2.8.5.patch
@@ -180,8 +180,8 @@ diff -ur cmake-2.8.5_orig/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenG
      # On Unix OpenGL most certainly always requires X11.
 diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake
 --- cmake-2.8.5_orig/Modules/Platform/Haiku.cmake	2011-07-08 12:21:44.016777216 +0000
-+++ cmake-2.8.5/Modules/Platform/Haiku.cmake	2011-07-09 17:59:50.092798976 +0000
-@@ -1,18 +1,29 @@
++++ cmake-2.8.5/Modules/Platform/Haiku.cmake	2011-07-10 23:52:01.025952256 +0000
+@@ -1,18 +1,25 @@
 -SET(BEOS 1)
 +SET(HAIKU 1)
 +SET(UNIX 1)
@@ -195,7 +195,7 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf
  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
 +SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
  SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-+  SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
++SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
  
 -INCLUDE(Platform/UnixPaths)
 -LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common)
@@ -204,15 +204,11 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf
 -LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin)
 -LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib)
 +LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
-+  /boot/home/config/non-packaged
-+  /boot/home/config
 +  /boot/common/non-packaged
 +  /boot/common
 +  /boot/system
 +  )
 +LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+  /boot/home/config/non-packaged/lib
-+  /boot/home/config/lib
 +  /boot/common/non-packaged/lib
 +  /boot/common/lib
 +  /boot/develop/lib/x86