diff --git a/libheimdal.changes b/libheimdal.changes
index 91969a4..8e739a6 100644
--- a/libheimdal.changes
+++ b/libheimdal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 02 08:04:33 UTC 2015 - joerg.lorenzen@ki.tng.de
+
+- Added Conflicts tags to spec file because devel package conflicts
+  with krb5-devel and krb5-mini-devel.
+
 -------------------------------------------------------------------
 Tue Sep 01 21:03:13 UTC 2015 - joerg.lorenzen@ki.tng.de
 
diff --git a/libheimdal.spec b/libheimdal.spec
index bac9e1d..bba9868 100644
--- a/libheimdal.spec
+++ b/libheimdal.spec
@@ -68,6 +68,8 @@ libraries are required by 64bit package of ICAClient version 13.2.
 Summary:        Libraries of Kerberos 5 implementation
 Group:          Development/Libraries/C and C++
 Requires:       libheimdal = %{version}
+Conflicts:      krb5-devel
+Conflicts:      krb5-mini-devel
 
 %description devel
 Heimdal is an implementation of Kerberos 5 (and some more stuff) largely written