diff --git a/include/boost/mp11/algorithm.hpp b/include/boost/mp11/algorithm.hpp
index 6a72a52..988d3f8 100644
--- a/include/boost/mp11/algorithm.hpp
+++ b/include/boost/mp11/algorithm.hpp
@@ -198,8 +198,37 @@ template<class L, class N> struct mp_repeat_impl
 template<class L, std::size_t N> using mp_repeat_c = typename detail::mp_repeat_c_impl<L, N>::type;
 template<class L, class N> using mp_repeat = typename detail::mp_repeat_impl<L, N>::type;
 
-// mp_drop<L, N>
-// mp_take<L, N>
+// mp_product<F, L...>
+
+namespace detail
+{
+
+template<template<class...> class F, class P, class... L> struct mp_product_impl_2;
+
+template<template<class...> class F, class P> struct mp_product_impl_2<F, P>
+{
+    using type = mp_list<mp_rename<P, F>>;
+};
+
+template<template<class...> class F, class P, template<class...> class L1, class... T1, class... L> struct mp_product_impl_2<F, P, L1<T1...>, L...>
+{
+    using type = mp_append<typename mp_product_impl_2<F, mp_push_back<P, T1>, L...>::type...>;
+};
+
+template<template<class...> class F, class... L> struct mp_product_impl;
+
+template<template<class...> class F, class L1, class... L> struct mp_product_impl<F, L1, L...>
+{
+    using type = mp_assign<L1, typename mp_product_impl_2<F, mp_list<>, L1, L...>::type>;
+};
+
+} // namespace detail
+
+template<template<class...> class F, class... L> using mp_product = typename detail::mp_product_impl<F, L...>::type;
+
+// mp_drop(_c)<L, N>
+// mp_take(_c)<L, N>
+// mp_at(_c)<L, I>
 // mp_find<L, V>
 // mp_find_if<L, P>
 // mp_find_index<L, V>
@@ -207,7 +236,6 @@ template<class L, class N> using mp_repeat = typename detail::mp_repeat_impl<L,
 // mp_reverse<L>
 // mp_copy_if<L, P>
 // mp_remove_if<L, P>
-// mp_product<L...>?
 // mp_fold<L, V, F>
 // mp_reverse_fold<L, V, F>
 // mp_replace<L, V1, V2>?
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index eb3e20c..ec31f1c 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -33,6 +33,7 @@ run mp_count.cpp : : : $(REQ) ;
 run mp_count_if.cpp : : : $(REQ) ;
 run mp_contains.cpp : : : $(REQ) ;
 run mp_repeat.cpp : : : $(REQ) ;
+run mp_product.cpp : : : $(REQ) ;
 
 # integral
 run integral.cpp : : : $(REQ) ;
diff --git a/test/mp_product.cpp b/test/mp_product.cpp
new file mode 100644
index 0000000..351ea38
--- /dev/null
+++ b/test/mp_product.cpp
@@ -0,0 +1,50 @@
+
+//  Copyright 2015 Peter Dimov.
+//
+// Distributed under 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 <boost/mp11/algorithm.hpp>
+#include <boost/mp11/list.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
+#include <type_traits>
+#include <tuple>
+#include <utility>
+
+struct X1 {};
+struct X2 {};
+struct X3 {};
+
+struct Y1 {};
+
+struct Z1 {};
+struct Z2 {};
+
+template<class T1, class T2, class T3> struct F {};
+
+int main()
+{
+    using boost::mp_list;
+    using boost::mp_product;
+
+    {
+        using L1 = std::tuple<X1, X2, X3>;
+        using L2 = mp_list<Y1>;
+        using L3 = std::pair<Z1, Z2>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_product<F, L1, L2, L3>, std::tuple<F<X1, Y1, Z1>, F<X1, Y1, Z2>, F<X2, Y1, Z1>, F<X2, Y1, Z2>, F<X3, Y1, Z1>, F<X3, Y1, Z2>>>));
+    }
+
+    {
+        using L1 = std::tuple<X1, X2, X3>;
+        using L2 = mp_list<>;
+        using L3 = std::pair<Z1, Z2>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_product<F, L1, L2, L3>, std::tuple<>>));
+    }
+
+    return boost::report_errors();
+}