diff --git a/openvswitch-dpdk.changes b/openvswitch-dpdk.changes
index fbb40d5..85486f9 100644
--- a/openvswitch-dpdk.changes
+++ b/openvswitch-dpdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul  4 12:08:06 UTC 2016 - mchandras@suse.de
+
+- Allow the OvS daemon to run as non-root (bsc#987545)
+- Add missing 'Conflicts' statements in the devel subpackage as
+  required by the Factory review tools.
+
 -------------------------------------------------------------------
 Wed Jun 29 15:17:07 UTC 2016 - mchandras@suse.de
 
diff --git a/openvswitch-dpdk.spec b/openvswitch-dpdk.spec
index e486f42..1c23ab2 100644
--- a/openvswitch-dpdk.spec
+++ b/openvswitch-dpdk.spec
@@ -59,6 +59,7 @@ BuildRequires:  fdupes
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
 BuildRequires:  graphviz
+BuildRequires:  libcap-ng-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
 BuildRequires:  make
@@ -111,6 +112,9 @@ Summary:        Open vSwitch Devel Libraries (DPDK)
 License:        Apache-2.0
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
+%if %{with dpdk}
+Conflicts:      openvswitch-devel
+%endif
 Provides:       openvswitch-any-devel = %{version}
 
 %description devel
@@ -269,6 +273,7 @@ dpdk_opt="--with-dpdk"
 
 %configure \
         --disable-static \
+        --enable-libcapng \
         --enable-shared \
         ${dpdk_opt} \
         --with-logdir=%{_localstatedir}/log/openvswitch
diff --git a/openvswitch.changes b/openvswitch.changes
index fbb40d5..85486f9 100644
--- a/openvswitch.changes
+++ b/openvswitch.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul  4 12:08:06 UTC 2016 - mchandras@suse.de
+
+- Allow the OvS daemon to run as non-root (bsc#987545)
+- Add missing 'Conflicts' statements in the devel subpackage as
+  required by the Factory review tools.
+
 -------------------------------------------------------------------
 Wed Jun 29 15:17:07 UTC 2016 - mchandras@suse.de
 
diff --git a/openvswitch.spec b/openvswitch.spec
index f27e584..aadebff 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -57,6 +57,7 @@ BuildRequires:  fdupes
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
 BuildRequires:  graphviz
+BuildRequires:  libcap-ng-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
 BuildRequires:  make
@@ -109,6 +110,9 @@ Summary:        Open vSwitch Devel Libraries
 License:        Apache-2.0
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
+%if %{with dpdk}
+Conflicts:      openvswitch-devel
+%endif
 Provides:       openvswitch-any-devel = %{version}
 
 %description devel
@@ -267,6 +271,7 @@ dpdk_opt="--with-dpdk"
 
 %configure \
         --disable-static \
+        --enable-libcapng \
         --enable-shared \
         ${dpdk_opt} \
         --with-logdir=%{_localstatedir}/log/openvswitch