diff --git a/CMakeLists.txt b/CMakeLists.txt
index a79bac21e..0a28ae482 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -194,6 +194,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
      set(OS_IS_MACOSX TRUE)
      exec_program(uname ARGS -v  OUTPUT_VARIABLE DARWIN_VERSION)
      string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
+     if(${DARWIN_VERSION} MATCHES "15")
+         set(MACOSX_EL_CAPITAN TRUE)
+         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
+         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.11 El Capitan")
+     endif(${DARWIN_VERSION} MATCHES "15")
      if(${DARWIN_VERSION} MATCHES "14")
          set(MACOSX_YOSEMITE TRUE)
          set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt
index 1e4943c61..0be3c7f1c 100644
--- a/src/core/libs/supl/CMakeLists.txt
+++ b/src/core/libs/supl/CMakeLists.txt
@@ -25,9 +25,10 @@ set (SUPL_SOURCES
 
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/libs/supl
+        ${CMAKE_SOURCE_DIR}/src/core/libs/supl
 	${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
 	${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
+        ${OPENSSL_INCLUDE_DIR}
 	)
 
 if(CMAKE_C_COMPILER_ID MATCHES "Clang")
@@ -39,4 +40,4 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 
 add_library (supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
 target_link_libraries (supl_library ssl gnss_system_parameters) 
-set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C)
\ No newline at end of file
+set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C)