diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_5.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_5.cpp
index 942df9285..02a888b33 100644
--- a/doc/doxy/doxygen_input/sourcecode/doxygen_5.cpp
+++ b/doc/doxy/doxygen_input/sourcecode/doxygen_5.cpp
@@ -47,7 +47,7 @@ namespace example_legacy_point1
     // The first way to check a concept at compile time: checking if the input is parameter
     // or return type is OK.
     template <typename P>
-    BOOST_CONCEPT_REQUIRES(((boost::geometry::concept::Point<P>)), (void))
+    BOOST_CONCEPT_REQUIRES(((boost::geometry::concepts::Point<P>)), (void))
     test1(P& p)
     {
     }
@@ -57,7 +57,7 @@ namespace example_legacy_point1
     template <typename P>
     void test2(P& p)
     {
-        BOOST_CONCEPT_ASSERT((boost::geometry::concept::Point<P>));
+        BOOST_CONCEPT_ASSERT((boost::geometry::concepts::Point<P>));
     }
 
 
@@ -90,7 +90,7 @@ namespace example_legacy_point2
     // test it using boost concept requires
 
     template <typename P>
-    BOOST_CONCEPT_REQUIRES(((boost::geometry::concept::ConstPoint<P>)), (double))
+    BOOST_CONCEPT_REQUIRES(((boost::geometry::concepts::ConstPoint<P>)), (double))
     test3(P& p)
     {
         return boost::geometry::get<0>(p);
@@ -123,7 +123,7 @@ namespace example_custom_linestring1
     void example()
     {
         typedef custom_linestring1<legacy_point1> L;
-        BOOST_CONCEPT_ASSERT((boost::geometry::concept::Linestring<L>));
+        BOOST_CONCEPT_ASSERT((boost::geometry::concepts::Linestring<L>));
 
     }
 }
diff --git a/doc/quickbook/quickref.xml b/doc/quickbook/quickref.xml
index 8179d7a87..3188d3287 100644
--- a/doc/quickbook/quickref.xml
+++ b/doc/quickbook/quickref.xml
@@ -32,28 +32,28 @@
    <entry valign="top">
     <bridgehead renderas="sect3">0-dimensional</bridgehead>
     <simplelist type="vert" columns="1">
-     <member><link linkend="boost_geometry.reference.concept__Point">boost::geometry::concept::Point</link></member>
-     <member><link linkend="boost_geometry.reference.concept__ConstPoint">boost::geometry::concept::ConstPoint</link></member>
+     <member><link linkend="boost_geometry.reference.concept__Point">boost::geometry::concepts::Point</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstPoint">boost::geometry::concepts::ConstPoint</link></member>
       </simplelist>
     </entry>
     <entry valign="top">
     <bridgehead renderas="sect3">1-dimensional</bridgehead>
     <simplelist type="vert" columns="1">
-     <member><link linkend="boost_geometry.reference.concept__Segment">boost::geometry::concept::Segment</link></member>
-     <member><link linkend="boost_geometry.reference.concept__ConstSegment">boost::geometry::concept::ConstSegment</link></member>
-     <member><link linkend="boost_geometry.reference.concept__Linestring">boost::geometry::concept::Linestring</link></member>
-     <member><link linkend="boost_geometry.reference.concept__ConstLinestring">boost::geometry::concept::ConstLinestring</link></member>
+     <member><link linkend="boost_geometry.reference.concept__Segment">boost::geometry::concepts::Segment</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstSegment">boost::geometry::concepts::ConstSegment</link></member>
+     <member><link linkend="boost_geometry.reference.concept__Linestring">boost::geometry::concepts::Linestring</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstLinestring">boost::geometry::concepts::ConstLinestring</link></member>
     </simplelist>
    </entry>
    <entry valign="top">
     <bridgehead renderas="sect3">2-dimensional</bridgehead>
     <simplelist type="vert" columns="1">
-     <member><link linkend="boost_geometry.reference.concept__Box">boost::geometry::concept::Box</link></member>
-     <member><link linkend="boost_geometry.reference.concept__ConstBox">boost::geometry::concept::ConstBox</link></member>
-     <member><link linkend="boost_geometry.reference.concept__Ring">boost::geometry::concept::Ring</link></member>
-     <member><link linkend="boost_geometry.reference.concept__ConstRing">boost::geometry::concept::ConstRing</link></member>
-     <member><link linkend="boost_geometry.reference.concept__Polygon">boost::geometry::concept::Polygon</link></member>
-     <member><link linkend="boost_geometry.reference.concept__ConstPolygon">boost::geometry::concept::ConstPolygon</link></member>
+     <member><link linkend="boost_geometry.reference.concept__Box">boost::geometry::concepts::Box</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstBox">boost::geometry::concepts::ConstBox</link></member>
+     <member><link linkend="boost_geometry.reference.concept__Ring">boost::geometry::concepts::Ring</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstRing">boost::geometry::concepts::ConstRing</link></member>
+     <member><link linkend="boost_geometry.reference.concept__Polygon">boost::geometry::concepts::Polygon</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstPolygon">boost::geometry::concepts::ConstPolygon</link></member>
     </simplelist>
    </entry>
   </row>
@@ -61,8 +61,8 @@
    <entry valign="center" namest="a" nameend="c">
     <bridgehead renderas="sect3">Functions</bridgehead>
     <simplelist type="vert" columns="1">
-     <member><link linkend="boost_geometry.reference.concept__check">boost::geometry::concept::check</link></member>
-     <member><link linkend="boost_geometry.reference.concept__check_concepts_and_equal_dimensions">boost::geometry::concept::check_concepts_and_equal_dimensions</link></member>
+     <member><link linkend="boost_geometry.reference.concept__check">boost::geometry::concepts::check</link></member>
+     <member><link linkend="boost_geometry.reference.concept__check_concepts_and_equal_dimensions">boost::geometry::concepts::check_concepts_and_equal_dimensions</link></member>
       </simplelist>
     </entry>
   </row>
@@ -496,18 +496,18 @@
   <row>
    <entry valign="top">
     <simplelist type="vert" columns="1">
-    <member><link linkend="boost_geometry.reference.concept__AreaStrategy">boost::geometry::concept::AreaStrategy</link></member>
-    <member><link linkend="boost_geometry.reference.concept__CentroidStrategy">boost::geometry::concept::CentroidStrategy</link></member>
-    <member><link linkend="boost_geometry.reference.concept__ConvexHullStrategy">boost::geometry::concept::ConvexHullStrategy</link></member>
-    <member><link linkend="boost_geometry.reference.concept__PointDistanceStrategy">boost::geometry::concept::PointDistanceStrategy</link></member>
-    <member><link linkend="boost_geometry.reference.concept__PointSegmentDistanceStrategy">boost::geometry::concept::PointSegmentDistanceStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__AreaStrategy">boost::geometry::concepts::AreaStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__CentroidStrategy">boost::geometry::concepts::CentroidStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__ConvexHullStrategy">boost::geometry::concepts::ConvexHullStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__PointDistanceStrategy">boost::geometry::concepts::PointDistanceStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__PointSegmentDistanceStrategy">boost::geometry::concepts::PointSegmentDistanceStrategy</link></member>
     </simplelist>
    </entry>
    <entry valign="top">
     <simplelist type="vert" columns="1">
-    <member><link linkend="boost_geometry.reference.concept__SegmentIntersectStrategy">boost::geometry::concept::SegmentIntersectStrategy</link></member>
-    <member><link linkend="boost_geometry.reference.concept__SimplifyStrategy">boost::geometry::concept::SimplifyStrategy</link></member>
-    <member><link linkend="boost_geometry.reference.concept__WithinStrategy">boost::geometry::concept::WithinStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__SegmentIntersectStrategy">boost::geometry::concepts::SegmentIntersectStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__SimplifyStrategy">boost::geometry::concepts::SimplifyStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__WithinStrategy">boost::geometry::concepts::WithinStrategy</link></member>
     </simplelist>
    </entry>
    </row>
diff --git a/doc/release_notes.qbk b/doc/release_notes.qbk
index 2981028d8..6a0e8e406 100644
--- a/doc/release_notes.qbk
+++ b/doc/release_notes.qbk
@@ -25,6 +25,7 @@
 [*Improvements]
 
 * SVG: support boost::variant of geometries
+* Rename namespace concept to concepts to avoid conflicts with the newest compilers
 
 [*Solved tickets]