diff --git a/librealsense.remove-cflags.patch b/librealsense.remove-cflags.patch
index 722a196..00f3674 100644
--- a/librealsense.remove-cflags.patch
+++ b/librealsense.remove-cflags.patch
@@ -1,25 +1,19 @@
-commit 6c5ced0b89eb60cb11dea3f97272d3760271d115
-Author: Till Hofmann <thofmann@fedoraproject.org>
-Date:   Fri Jan 26 18:09:43 2018 +0100
-
-    Remove some CFLAGS modification
-    
-    We want to use the distro's CFLAGS as close as possible.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cf949782..e2ea6d72 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -754,22 +754,9 @@ if(UNIX)
-         endif(LIBUSB1_FOUND)
-     endif()
+diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake
+index 3bcfb554..cb65616c 100644
+--- a/CMake/unix_config.cmake
++++ b/CMake/unix_config.cmake
+@@ -2,25 +2,12 @@ message(STATUS "Setting Unix configurations")
  
+ macro(os_set_flags)
+     set(BACKEND RS2_USE_V4L2_BACKEND)
 -    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC -pedantic -g -D_BSD_SOURCE")
 -    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pedantic -g -Wno-missing-field-initializers")
 +    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC -D_BSD_SOURCE")
 +    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wno-missing-field-initializers")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch -Wno-multichar -Wsequence-point -Wformat-security")
--
+ 
+     add_definitions(-DUSE_SYSTEM_LIBUSB)
+ 
 -    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE MACHINE)
 -    if(${MACHINE} MATCHES "arm-linux-gnueabihf")
 -        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -mfpu=neon -mfloat-abi=hard -ftree-vectorize")
@@ -32,6 +26,7 @@ index cf949782..e2ea6d72 100644
 -        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mssse3")
 -        set(LRS_TRY_USE_AVX true)
 -    endif(${MACHINE} MATCHES "arm-linux-gnueabihf")
- endif()
- 
- # Set CMAKE_INSTALL_* if not defined
+-
+     if(NOT BUILD_WITH_OPENMP)
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")