diff --git a/libipt.spec b/libipt.spec
index 64f0824..347cb2c 100644
--- a/libipt.spec
+++ b/libipt.spec
@@ -1,12 +1,13 @@
 Name: libipt
 Version: 1.6.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Intel Processor Trace Decoder Library
 License: BSD
 URL: https://github.com/01org/processor-trace
 Source0: https://github.com/01org/processor-trace/archive/v%{version}.tar.gz
 Patch1: v1.6.1-implicit-fallthrough.patch
-BuildRequires: cmake
+Patch2: v1.6.1-buildrequires-c.patch
+BuildRequires: gcc cmake
 ExclusiveArch: %{ix86} x86_64
 
 %description
@@ -28,6 +29,7 @@ develop programs that use the Intel Processor Trace (Intel PT) Decoder Library.
 %prep
 %setup -q -n processor-trace-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
 # -DPTUNIT:BOOL=ON has no effect on ctest.
@@ -56,9 +58,14 @@ ctest -V %{?_smp_mflags}
 %{_libdir}/%{name}.so
 
 %changelog
+* Sat Mar  3 2018 Jan Kratochvil <jan.kratochvil@redhat.com> - 1.6.1-7
+- Add: BuildRequires: gcc-c++
+  https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequires_and_Requires
+
 * Fri Mar  2 2018 Jan Kratochvil <jan.kratochvil@redhat.com> - 1.6.1-6
 - Fix v1.6.1-implicit-fallthrough.patch compatibility with gcc < 7.
 - Use %%ldconfig_scriptlets.
+  https://fedoraproject.org/wiki/Packaging:Scriptlets#Shared_Libraries
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/v1.6.1-buildrequires-c.patch b/v1.6.1-buildrequires-c.patch
new file mode 100644
index 0000000..608b43a
--- /dev/null
+++ b/v1.6.1-buildrequires-c.patch
@@ -0,0 +1,23 @@
+commit 3543461d352d912722fcf51ceed4f0bb22f81342
+Author: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date:   Sat Mar 3 05:44:54 2018 +0100
+
+    Do not require C++ compiler
+    
+    CMake requires both C and C++ compilers by default.  Require only C.
+    
+    Signed-off-by: Jan Kratochvil <jan.kratochvil@redhat.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 257ad1c..174a1c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ 
+ cmake_minimum_required(VERSION 2.8.6)
+ 
+-project(PT)
++project(PT C)
+ 
+ # versioning
+ #