diff --git a/boost.changes b/boost.changes
index 0a15f37..06d25ef 100644
--- a/boost.changes
+++ b/boost.changes
@@ -5,11 +5,6 @@ Sat Jun  8 08:41:55 UTC 2013 - schwab@suse.de
 - Reenable mpi on aarch64
 - Avoid duplication between %build and %install
 
--------------------------------------------------------------------
-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 bfba723..3cec7c2 100644
--- a/boost.spec
+++ b/boost.spec
@@ -181,9 +181,6 @@ 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