diff --git a/include/boost/range/join.hpp b/include/boost/range/join.hpp
index ad0217e..aacc0a3 100644
--- a/include/boost/range/join.hpp
+++ b/include/boost/range/join.hpp
@@ -36,6 +36,9 @@ public:
 
     } // namespace range_detail
 
+namespace range
+{
+
 template<class SinglePassRange1, class SinglePassRange2>
 class joined_range
     : public range_detail::joined_type<SinglePassRange1, SinglePassRange2>::type
@@ -78,6 +81,11 @@ join(SinglePassRange1& r1, SinglePassRange2& r2)
     return joined_range<SinglePassRange1, SinglePassRange2>(r1, r2);
 }
 
+} // namespace range
+
+using ::boost::range::joined_range;
+using ::boost::range::join;
+
 } // namespace boost
 
 #endif // include guard
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index ec67d7b..afab584 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -173,6 +173,7 @@ test-suite range :
 	[ range-test sub_range ]
 	[ range-test ticket_5486 ]
 	[ range-test ticket_5544_terminate_irange ]
+	[ range-test ticket_5547 ]
 	[ range-test ticket_5556_is_sorted_namespace ]
     ;
 
diff --git a/test/ticket_5547.cpp b/test/ticket_5547.cpp
new file mode 100644
index 0000000..1b9d3f6
--- /dev/null
+++ b/test/ticket_5547.cpp
@@ -0,0 +1,42 @@
+// Boost.Range library
+//
+//  Copyright Neil Groves 2011. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+//
+//
+// For more information, see http://www.boost.org/libs/range/
+//
+#include <boost/algorithm/string/join.hpp>
+#include <boost/range/join.hpp>
+
+#include <boost/test/test_tools.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include <vector>
+
+namespace boost
+{
+    namespace
+    {
+   
+        // Ticket 5547 - boost::join ambiguous with algorithm::join
+        void test_ticket_5547()
+        {
+            std::vector<int> x;
+            boost::range::join(x,x);
+        }
+    }
+}
+
+boost::unit_test::test_suite*
+init_unit_test_suite(int argc, char* argv[])
+{
+    boost::unit_test::test_suite* test
+        = BOOST_TEST_SUITE( "RangeTestSuite.ticket_5547" );
+
+    test->add( BOOST_TEST_CASE( &boost::test_ticket_5547 ) );
+
+    return test;
+}