diff --git a/CHANGELOG b/CHANGELOG
index 92d3ffe5c..b65465e79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2017-09-27
+
+    - Fix CMakeLists.txt: BoringSSL include and lib was mixed up
+
 2017-09-26
 
     - Add support for Mac OS
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 984a6a7b4..286e0a8a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,12 +59,15 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ${MY_CMAKE_FLAGS} $ENV{EXTRA_CFLAGS}")
 MESSAGE(STATUS "Compiler flags: ${CMAKE_C_FLAGS}")
 
 IF(NOT DEFINED BORINGSSL_INCLUDE)
-    include_directories( /usr/local/lib )
+    SET(BORINGSSL_INCLUDE /usr/local/include)
 ENDIF()
 IF(NOT DEFINED BORINGSSL_LIB)
-    link_directories( /usr/local/include )
+    SET(BORINGSSL_LIB /usr/local/lib)
 ENDIF()
 
+include_directories( ${BORINGSSL_INCLUDE} )
+link_directories( ${BORINGSSL_LIB} )
+
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 include_directories( include )