diff --git a/python-rtslib-fb.changes b/python-rtslib-fb.changes
index 4bd2edb..672fab4 100644
--- a/python-rtslib-fb.changes
+++ b/python-rtslib-fb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 14 14:57:28 UTC 2014 - speilicke@suse.com
+
+- Conflict with python-rtslib
+
 -------------------------------------------------------------------
 Mon Jan 13 13:25:15 UTC 2014 - dmueller@suse.com
 
diff --git a/python-rtslib-fb.spec b/python-rtslib-fb.spec
index 92c7ffe..c66e409 100644
--- a/python-rtslib-fb.spec
+++ b/python-rtslib-fb.spec
@@ -32,6 +32,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %else
 BuildArch:      noarch
 %endif
+# This is the "free branch" of rtslib, they share modules but have differnt code...
+Conflicts:      python-rtslib
 
 %description
 rtslib-fb is an object-based Python library for configuring the LIO generic