diff --git a/armnn.changes b/armnn.changes
index 2d4d3df..36f6ead 100644
--- a/armnn.changes
+++ b/armnn.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 28 13:06:56 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add a conflict between armnn-devel and armnn-opencl-devel
+
 -------------------------------------------------------------------
 Mon Oct 28 09:56:16 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/armnn.spec b/armnn.spec
index b604ba3..b478995 100644
--- a/armnn.spec
+++ b/armnn.spec
@@ -191,6 +191,12 @@ modification – across Arm Cortex CPUs and Arm Mali GPUs.
 %package devel
 Summary:        Development headers and libraries for armnn
 Group:          Development/Libraries/C and C++
+# Make sure we do not install both openCL and non-openCL (CPU only) versions.
+%if "%{target}" == "opencl"
+Conflicts:      armnn-devel
+%else
+Conflicts:      armnn-opencl-devel
+%endif
 Requires:       %{name} = %{version}
 Requires:       libarmnn%{version_major}%{?package_suffix} = %{version}
 %if %{with armnn_flatbuffers}