diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8cb276631..d23b26099f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,6 +121,7 @@ if (UNIX)
                 /usr/include/x86_64-linux-gnu
                 /usr/local/include
                 /opt/local/include
+                /usr/local/opt/icu4c/include
             CMAKE_FIND_ROOT_PATH_BOTH
         )
         if ("${ICU_INCLUDE_DIR}" STREQUAL "ICU_INCLUDE_DIR-NOTFOUND")
@@ -236,6 +237,7 @@ if (APPLE)
     if (NOT CMAKE_CROSSCOMPILING)
         include_directories(/opt/local/include)
         link_directories(/opt/local/lib)
+        link_directories(/usr/local/opt/icu4c/lib)
     endif()
 
     find_library(LIB_CoreFoundation CoreFoundation)
diff --git a/builds/cmake/Configure.cmake b/builds/cmake/Configure.cmake
index ae4ba1f1ed..1e1e9a12b3 100644
--- a/builds/cmake/Configure.cmake
+++ b/builds/cmake/Configure.cmake
@@ -245,6 +245,10 @@ set(functions_list
 )
 check_functions(functions_list)
 
+if (APPLE)
+    set(HAVE_QSORT_R 0 CACHE STRING "Disabled on OS X" FORCE)
+endif()
+
 check_cxx_source_compiles("#include <unistd.h>\nmain(){fdatasync(0);}" HAVE_FDATASYNC)
 
 check_library_exists(dl dladdr "${CMAKE_LIBRARY_PREFIX}" HAVE_DLADDR)