diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2d144ea55022784eb8a1155445b348054bba7d2..f2333ebd9487fa84c5bda0c630b5c76b1f5a3e42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ MESSAGE(STATUS "Using CMake ${CMAKE_VERSION}")
 # Compile for profiling with GProf
 # - binaries need to be run to create gmon.out file and
 # 'gprof' command is run subsequently!
+#TODO create 'profiling' user parameter
 #ADD_COMPILE_OPTIONS(-pg)
 #ADD_LINK_OPTIONS(-pg)
 
@@ -153,6 +154,15 @@ ELSEIF("${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
     SET(LIB_SUFFIX "so")
 ENDIF()
 
+#-------------#
+# Find OpenMP #
+#-------------#
+MESSAGE("Looking for OpenMP support...")
+FIND_PACKAGE(OpenMP)
+IF(OpenMP_FOUND)
+    ADD_COMPILE_OPTIONS(${OpenMP_CXX_FLAGS})
+ENDIF()
+
 #-------------------------#
 # Find external libraries #
 #-------------------------#
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 656da507cf722c9bc850d5d2c7bb8801b22fa068..575da7ef454ffc396f5d4bc2eb1fd3c0a40d30e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -145,6 +145,7 @@ IF("${BUILD_LIB}" STREQUAL "yes")
         ${BLAS_LIBRARIES}
         ${LAPACK_LIBRARIES}
         ${GFORT}
+        ${OpenMP_CXX_LIBRARIES}
     )
 
     TARGET_INCLUDE_DIRECTORIES(