diff --git a/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp b/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
index 1067f43d3..008779a44 100644
--- a/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
+++ b/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
@@ -16,6 +16,8 @@
 #include <boost/geometry/algorithms/detail/relate/point_geometry.hpp>
 #include <boost/geometry/algorithms/detail/relate/turns.hpp>
 
+#include <boost/range.hpp>
+
 namespace boost { namespace geometry
 {
 
@@ -86,7 +88,7 @@ struct linear_linear
 
         // TODO: handle also linestrings with points_num == 2 and equals(front, back) - treat like point?
 
-        result res("FFFFFFFFF");
+        result res("FFFFFFFFT");
 
         // TODO: implement generic function working also for multilinestrings, also use it in point_in_geometry
         bool has_boundary1 = ! detail::equals::equals_point_point(front(geometry1), back(geometry1));
@@ -119,7 +121,7 @@ struct linear_linear
 
         std::deque<typename turns::get_turns<Geometry1, Geometry2>::turn_info> turns;
 
-        turns::get_turns<Geometry1, Geometry2>::apply(turns, geometry2, geometry2);
+        turns::get_turns<Geometry1, Geometry2>::apply(turns, geometry1, geometry2);
 
         // TODO: turns must be analysed this way only if it's possible to go out and in on the same point
         // for linear geometries union or intersection operation was detected
diff --git a/include/boost/geometry/algorithms/detail/relate/relate.hpp b/include/boost/geometry/algorithms/detail/relate/relate.hpp
new file mode 100644
index 000000000..4bccdc3d8
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/relate.hpp
@@ -0,0 +1,93 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_HPP
+
+#include <cstddef>
+
+#include <boost/concept_check.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/algorithms/make.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/strategies/concepts/within_concept.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
+#include <boost/geometry/strategies/within.hpp>
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/order_as_direction.hpp>
+#include <boost/geometry/views/closeable_view.hpp>
+#include <boost/geometry/views/reversible_view.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/point_geometry.hpp>
+#include <boost/geometry/algorithms/detail/relate/linear_linear.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail_dispatch { namespace relate {
+
+template <typename Geometry1,
+          typename Geometry2,
+          typename Tag1 = typename geometry::tag<Geometry1>::type,
+          typename Tag2 = typename geometry::tag<Geometry2>::type>
+struct relate : not_implemented<Tag1, Tag2>
+{};
+
+template <typename Point1, typename Point2>
+struct relate<Point1, Point2, point_tag, point_tag>
+    : detail::relate::point_point<Point1, Point2>
+{};
+
+template <typename Point, typename Geometry, typename Tag2>
+struct relate<Point, Geometry, point_tag, Tag2>
+    : detail::relate::point_geometry<Point, Geometry>
+{};
+
+template <typename Geometry, typename Point, typename Tag1>
+struct relate<Geometry, Point, Tag1, point_tag>
+    : detail::relate::geometry_point<Geometry, Point>
+{};
+
+template <typename Linestring1, typename Linestring2>
+struct relate<Linestring1, Linestring2, linestring_tag, linestring_tag>
+    : detail::relate::linear_linear<Linestring1, Linestring2>
+{};
+
+}} // namespace detail_dispatch::relate
+
+namespace detail { namespace relate {
+
+template <typename Geometry1, typename Geometry2>
+inline result relate(Geometry1 const& geometry1, Geometry2 const& geometry2)
+{
+    return detail_dispatch::relate::relate<Geometry1, Geometry2>::apply(geometry1, geometry2);
+}
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/result.hpp b/include/boost/geometry/algorithms/detail/relate/result.hpp
index 544e8d2d8..424162125 100644
--- a/include/boost/geometry/algorithms/detail/relate/result.hpp
+++ b/include/boost/geometry/algorithms/detail/relate/result.hpp
@@ -67,6 +67,11 @@ public:
         ::memset(array, v, 9);
     }
 
+    std::pair<const char*, const char*> get_code() const
+    {
+        return std::make_pair(array, array+9);
+    }
+
 private:
     char array[9];
 };
diff --git a/include/boost/geometry/algorithms/within.hpp b/include/boost/geometry/algorithms/within.hpp
index 1f5c805de..75040782b 100644
--- a/include/boost/geometry/algorithms/within.hpp
+++ b/include/boost/geometry/algorithms/within.hpp
@@ -55,8 +55,6 @@
 #include <boost/geometry/algorithms/detail/overlay/do_reverse.hpp>
 #include <deque>
 
-#include <boost/geometry/algorithms/detail/relate/linear_linear.hpp>
-
 namespace boost { namespace geometry
 {
 
diff --git a/test/algorithms/relate.cpp b/test/algorithms/relate.cpp
new file mode 100644
index 000000000..a9dade464
--- /dev/null
+++ b/test/algorithms/relate.cpp
@@ -0,0 +1,122 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
+// 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)
+
+#include <geometry_test_common.hpp>
+
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/algorithms/within.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+#include <boost/geometry/geometries/ring.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <boost/geometry/io/wkt/read.hpp>
+
+#include <boost/geometry/strategies/cartesian/point_in_box.hpp>
+#include <boost/geometry/strategies/cartesian/box_in_box.hpp>
+#include <boost/geometry/strategies/agnostic/point_in_box_by_side.hpp>
+
+#include <boost/geometry/multi/algorithms/covered_by.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/relate.hpp>
+
+namespace bgdr = bg::detail::relate;
+
+template <typename Geometry1, typename Geometry2>
+void check_geometry(Geometry1 const& geometry1,
+                    Geometry2 const& geometry2,
+                    std::string const& wkt1,
+                    std::string const& wkt2,
+                    std::string const& expected)
+{
+    bgdr::result res = bgdr::relate(geometry1, geometry2);
+    std::string res_str(boost::begin(res.get_code()), boost::end(res.get_code()));
+    bool ok = boost::equal(res_str, expected);
+
+    BOOST_CHECK_MESSAGE(ok,
+        "relate: " << wkt1
+        << " and " << wkt2
+        << " -> Expected: " << expected
+        << " detected: " << res_str);
+}
+
+template <typename Geometry1, typename Geometry2>
+void test_geometry(std::string const& wkt1,
+                   std::string const& wkt2,
+                   std::string const& expected)
+{
+    Geometry1 geometry1;
+    Geometry2 geometry2;
+    bg::read_wkt(wkt1, geometry1);
+    bg::read_wkt(wkt2, geometry2);
+    check_geometry(geometry1, geometry2, wkt1, wkt2, expected);
+}
+
+template <typename P>
+void test_linestring_linestring()
+{
+    typedef bg::model::linestring<P> ls;
+//    test_geometry<ls, ls>("LINESTRING(0 0, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 3 2)", true);
+
+//    test_geometry<ls, ls>("LINESTRING(0 0, 1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 3 2)", true);
+//    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1, 0 0)", "LINESTRING(0 0, 2 2, 3 2)", true);
+//    test_geometry<ls, ls>("LINESTRING(0 0, 1 1, 2 2, 3 2)", "LINESTRING(3 2, 2 2, 0 0)", true);
+//    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1, 0 0)", "LINESTRING(3 2, 2 2, 0 0)", true);
+
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", true);
+//    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1)", "LINESTRING(0 0, 2 2, 4 2)", true);
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2)", "LINESTRING(4 2, 2 2, 0 0)", true);
+//    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1)", "LINESTRING(4 2, 2 2, 0 0)", true);
+
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 2 2)", "LINESTRING(0 0, 2 2, 4 2)", true);
+
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 3)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2, 3 3)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 1)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2, 3 1)", "LINESTRING(0 0, 2 2, 4 2)", false);
+
+//    test_geometry<ls, ls>("LINESTRING(0 1, 1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(0 1, 0 0, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 0, 1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 0, 0 0, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+
+//    test_geometry<ls, ls>("LINESTRING(0 0)", "LINESTRING(0 0)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 1)", "LINESTRING(0 0, 2 2)", true);
+//    test_geometry<ls, ls>("LINESTRING(0 0)", "LINESTRING(0 0, 2 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(0 0, 1 1)", "LINESTRING(0 0)", false);
+
+//    test_geometry<ls, ls>("LINESTRING(0 0,5 0,3 0,6 0)", "LINESTRING(0 0,6 0)", true);
+//    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1)", "LINESTRING(0 0,3 3,6 3)", true);
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1,5 3)", "LINESTRING(0 0,3 3,6 3)", "1F100F1FT");
+}
+
+template <typename P>
+void test_all()
+{
+    test_linestring_linestring<P>();
+}
+
+int test_main( int , char* [] )
+{
+    test_all<bg::model::d2::point_xy<int> >();
+    test_all<bg::model::d2::point_xy<double> >();
+
+#if defined(HAVE_TTMATH)
+    test_all<bg::model::d2::point_xy<ttmath_big> >();
+#endif
+
+    return 0;
+}
diff --git a/test/algorithms/within.cpp b/test/algorithms/within.cpp
index c9d7b642d..bf15c8385 100644
--- a/test/algorithms/within.cpp
+++ b/test/algorithms/within.cpp
@@ -49,20 +49,6 @@ void test_linestring_linestring()
     test_geometry<ls, ls>("LINESTRING(0 0,5 0,3 0,6 0)", "LINESTRING(0 0,6 0)", true);
     test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1)", "LINESTRING(0 0,3 3,6 3)", true);
     test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1,5 3)", "LINESTRING(0 0,3 3,6 3)", false);
-
-    // RELATE TEST
-    ls geometry1;
-    ls geometry2;
-    bg::read_wkt("LINESTRING(0 0,2 2,3 3,1 1,5 3)", geometry1);
-    bg::read_wkt("LINESTRING(0 0,3 3,6 3)", geometry2);
-    namespace bgr = bg::detail::relate;
-    bgr::result
-        res = bgr::linear_linear<ls, ls>::apply(geometry1, geometry2);
-    bool ii = res.template get<bgr::interior, bgr::interior>() != 'F';
-    bool ie = res.template get<bgr::interior, bgr::exterior>() != 'F';
-    bool be = res.template get<bgr::boundary, bgr::exterior>() != 'F';
-    bool w = ii && !ie && !be;
-    BOOST_CHECK(!w);
 }
 
 template <typename P>