diff --git a/CMake/HPHPFindLibs.cmake b/CMake/HPHPFindLibs.cmake
index db8821c18..f79a79f0b 100644
--- a/CMake/HPHPFindLibs.cmake
+++ b/CMake/HPHPFindLibs.cmake
@@ -183,6 +183,9 @@ if (USE_JEMALLOC AND NOT GOOGLE_TCMALLOC_ENABLED)
 		message(STATUS "Found jemalloc: ${JEMALLOC_LIB}")
 		set(JEMALLOC_ENABLED 1)
 	endif()
+	if (JEMALLOC_INCLUDE_DIR)
+		include_directories(${JEMALLOC_INCLUDE_DIR})
+	endif()
 endif()
 
 if (USE_TCMALLOC AND NOT JEMALLOC_ENABLED AND NOT GOOGLE_TCMALLOC_ENABLED)
@@ -197,9 +200,6 @@ endif()
 
 if (JEMALLOC_ENABLED)
 	add_definitions(-DUSE_JEMALLOC=1)
-	if (APPLE)
-		add_definitions(-DJEMALLOC_MANGLE=1 -DJEMALLOC_EXPERIMENTAL=1)
-	endif()
 else()
 	add_definitions(-DNO_JEMALLOC=1)
 endif()
@@ -335,6 +335,9 @@ endif()
 
 if (APPLE)
 	find_library(LIBINTL_LIBRARIES NAMES intl libintl)
+	if (LIBINTL_INCLUDE_DIR)
+		include_directories(${LIBINTL_INCLUDE_DIR})
+	endif()
 	find_library(KERBEROS_LIB NAMES gssapi_krb5)
 endif()