diff --git a/librealsense.remove-cflags.patch b/librealsense.remove-cflags.patch
new file mode 100644
index 0000000..a2675f3
--- /dev/null
+++ b/librealsense.remove-cflags.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b00247..893746e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -174,22 +174,6 @@ if(UNIX)
+     else()
+       message( FATAL_ERROR "Failed to find libusb-1.0" )
+     endif(LIBUSB1_FOUND)
+-
+-    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC -pedantic -g -D_BSD_SOURCE")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pedantic -g -Ofast -Wno-missing-field-initializers")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch -Wno-multichar")
+-
+-    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")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -mfloat-abi=hard -ftree-vectorize")
+-    elseif(${MACHINE} MATCHES "aarch64-linux-gnu")
+-      set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -mstrict-align -ftree-vectorize")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstrict-align -ftree-vectorize")
+-    else(${MACHINE} MATCHES "arm-linux-gnueabihf")
+-      set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -mssse3")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mssse3")
+-    endif(${MACHINE} MATCHES "arm-linux-gnueabihf")
+ endif()
+ 
+ # Set CMAKE_INSTALL_* if not defined
diff --git a/librealsense.spec b/librealsense.spec
index acc1557..a928288 100644
--- a/librealsense.spec
+++ b/librealsense.spec
@@ -1,14 +1,14 @@
 Name:           librealsense
 Version:        1.12.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Cross-platform camera capture for Intel RealSense
 
-License:        ASL 2.0
+License:        ASL 2.0 and BSD
 URL:            https://github.com/IntelRealSense/librealsense
 Source0:        https://github.com/IntelRealSense/librealsense/archive/v%{version}.tar.gz#/librealsense-%{version}.tar.gz
 # Fix architecture detection.
 # Pull request: https://github.com/IntelRealSense/librealsense/pull/416
-Patch0:         librealsense.buildflags-arm.patch
+Patch0:         librealsense.remove-cflags.patch
 
 BuildRequires:  cmake
 BuildRequires:  doxygen
@@ -17,10 +17,10 @@ BuildRequires:  systemd
 
 %description
 This project is a cross-platform library (Linux, OSX, Windows) for capturing
-data from the Intel® RealSense™ F200, SR300 and R200 cameras. This effort was
+data from the Intel RealSense F200, SR300 and R200 cameras. This effort was
 initiated to better support researchers, creative coders, and app developers in
 domains such as robotics, virtual reality, and the internet of things. Several
-often-requested features of RealSense™ devices are implemented in this project,
+often-requested features of RealSense devices are implemented in this project,
 including multi-camera capture.
 
 
@@ -100,6 +100,11 @@ install -p -m755 config/usb-R200-in{,_udev} %{buildroot}/%{_datadir}/realsense
 
 
 %changelog
+* Sat Jan 21 2017 Till Hofmann <till.hofmann@posteo.de> - 1.12.1-4
+- Add patch to remove any CFLAGS modification in cmake
+- Change License to "ASL 2.0 and BSD"
+- Remove trademarks from description
+
 * Mon Jan 16 2017 Till Hofmann <till.hofmann@posteo.de> - 1.12.1-3
 - Install bash scripts into datadir, not into libdir