diff --git a/boost.changes b/boost.changes
index 0905813..37d8ae5 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 29 11:48:57 UTC 2013 - varkoly@suse.com
+
+- Conflicts with man-pages 
+
 -------------------------------------------------------------------
 Wed Apr  3 14:20:58 CEST 2013 - pth@suse.de
 
diff --git a/boost.spec b/boost.spec
index 3f87a77..ced244e 100644
--- a/boost.spec
+++ b/boost.spec
@@ -174,6 +174,9 @@ Group:          Development/Libraries/C and C++
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
+%if 0%{?suse_version} >= 1230
+Conflicts:      man-pages
+%endif
 
 %description    doc-man
 This package contains the documentation of the boost dynamic libraries