diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5242e82..bdc482f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,16 @@ find_path(FF_INCLUDE_PATH fontforge/fontforge.h)
 if(FF_INCLUDE_PATH)
     message("Found fontforge.h: ${FF_INCLUDE_PATH}/fontforge/fontforge.h")
     include_directories(${FF_INCLUDE_PATH}/fontforge)
+    # MacOSX gettext is in /opt/local/include - strange
+    if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")  
+      find_path(GETTEXT_INCLUDE_PATH libintl.h)
+      if(GETTEXT_INCLUDE_PATH)
+        include_directories(${GETTEXT_INCLUDE_PATH})
+      else()
+        # disable i18n if there is no gettext
+        set(NO_GETTEXT "YesPlease")
+      endif()
+    endif()
 else()
     message(FATAL_ERROR "Error: cannot locate fontforge.h")
 endif()
@@ -54,6 +64,10 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused-function")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-function")
+# clang compiler need c++11 flag
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+endif()
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")