diff --git a/kio-extras5.changes b/kio-extras5.changes
index 279d50d..59cb035 100644
--- a/kio-extras5.changes
+++ b/kio-extras5.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr 21 11:57:45 UTC 2016 - wbauer@tmo.at
+
+- Conflict with kactivities5 5.19.0 and earlier to prevent file
+  conflicts. The activities fileitem_linking_plugin and kio slave
+  have been moved from kactivities5 to kio-extras5 in 16.04
+  (boo#976592)
+
 -------------------------------------------------------------------
 Sun Apr 17 06:05:50 UTC 2016 - tittiatcoke@gmail.com
 
diff --git a/kio-extras5.spec b/kio-extras5.spec
index 3ce6eea..9ffaf13 100644
--- a/kio-extras5.spec
+++ b/kio-extras5.spec
@@ -63,6 +63,8 @@ Recommends:     kimageformats
 #BuildRequires:  update-desktop-files
 Provides:       kfileaudiopreview = 4.100.0
 Obsoletes:      kfileaudiopreview <= 4.100.0
+# the activities fileitem_linking_plugin and kio slave have been moved over here in 16.04 (boo#976592)
+Conflicts:      kactivities5 <= 5.19.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description