diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake
index 8fab0b359fd2a1148f0bf7042be519b4625ab4ca..31c304804c033fc6f4cb142c726c618a45db1138 100644
--- a/cmake_support/OST.cmake
+++ b/cmake_support/OST.cmake
@@ -321,15 +321,15 @@ macro(executable)
   if (ENABLE_STATIC AND _ARG_STATIC)
     target_link_libraries(${_ARG_NAME} ${STATIC_LIBRARIES})
     if (UNIX AND NOT APPLE)
+      set_target_properties(${_ARG_NAME} PROPERTIES LINK_SEARCH_START_STATIC TRUE)
+      set_target_properties(${_ARG_NAME} PROPERTIES LINK_SEARCH_END_STATIC TRUE)
       if (OST_GCC_LESS_45)
-        set_target_properties(${_ARG_NAME}
-                              PROPERTIES LINK_SEARCH_END_STATIC TRUE  
-                              LINK_FLAGS "-static-libgcc -static -pthread")
+        set_target_properties(${_ARG_NAME} PROPERTIES LINK_FLAGS
+                              "-static-libgcc -static -pthread")
       else()
-        set_target_properties(${_ARG_NAME}
-                              PROPERTIES LINK_SEARCH_END_STATIC TRUE  
-                              LINK_FLAGS "-static-libgcc -static-libstdc++ -static -pthread")
-      endif()        
+        set_target_properties(${_ARG_NAME} PROPERTIES LINK_FLAGS
+                              "-static-libgcc -static-libstdc++ -static -pthread")
+      endif()
     endif()
   endif()
   install(TARGETS ${_ARG_NAME} DESTINATION bin)
diff --git a/modules/db/src/CMakeLists.txt b/modules/db/src/CMakeLists.txt
index 8c536297f304b1a8ec686500c2259159c7002230..8b59de092c830779d896e3a84a6cae83e43646a2 100644
--- a/modules/db/src/CMakeLists.txt
+++ b/modules/db/src/CMakeLists.txt
@@ -23,4 +23,6 @@ if(WIN32)
 else(WIN32)
   add_definitions(-DSQLITE_OMIT_LOAD_EXTENSION)
 endif(WIN32)
-
+if (ENABLE_STATIC AND UNIX AND NOT APPLE)
+  target_link_libraries(ost_db ${CMAKE_DL_LIBS})
+endif()