diff --git a/dirac.changes b/dirac.changes
index 65278f8..92ce43c 100644
--- a/dirac.changes
+++ b/dirac.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 11 09:00:33 UTC 2010 - davejplater@gmail.com
+
+- Added Conflicts: for conflicting packman packages
+
 -------------------------------------------------------------------
 Sun May  9 08:49:10 UTC 2010 - davejplater@gmail.com
 
diff --git a/dirac.spec b/dirac.spec
index a036201..94a5ad3 100644
--- a/dirac.spec
+++ b/dirac.spec
@@ -34,6 +34,7 @@ BuildRequires:  valgrind-devel pkg-config
 %endif
 BuildRequires:  doxygen fdupes graphviz-gd texlive-latex
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Conflicts:      dirac-doc
 
 %description
 Dirac is an open source video codec. It uses a traditional hybrid video
@@ -168,6 +169,7 @@ Group:          Development/Libraries/C and C++
 Summary:        Development Files for Dirac Video Codec
 Requires:       libdirac_decoder0 = %{version}
 Requires:       libdirac_encoder0 = %{version}
+Conflicts:       libdirac-devel
 
 %description devel
 Dirac is an open source video codec. It uses a traditional hybrid video