diff --git a/include/msgpack/adaptor/cpp11/tuple.hpp b/include/msgpack/adaptor/cpp11/tuple.hpp
new file mode 100644
index 00000000..b599b4c5
--- /dev/null
+++ b/include/msgpack/adaptor/cpp11/tuple.hpp
@@ -0,0 +1,121 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2008-2014 FURUHASHI Sadayuki and KONDO Takatoshi
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+#ifndef MSGPACK_CPP11_TUPLE_HPP
+#define MSGPACK_CPP11_TUPLE_HPP
+
+#include <tuple>
+
+#include "msgpack/object.hpp"
+#include "msgpack/cpp_config.hpp"
+
+namespace msgpack {
+
+// --- Pack ( from tuple to packer stream ---
+template <typename Stream, typename Tuple, std::size_t N>
+struct StdTuplePacker {
+	static void pack(
+		packer<Stream>& o,
+		const Tuple& v) {
+		StdTuplePacker<Stream, Tuple, N-1>::pack(o, v);
+		o.pack(std::get<N-1>(v));
+	}
+};
+
+template <typename Stream, typename Tuple>
+struct StdTuplePacker<Stream, Tuple, 1> {
+	static void pack (
+		packer<Stream>& o,
+		const Tuple& v) {
+		o.pack(std::get<0>(v));
+	}
+};
+
+template <typename Stream, typename... Args>
+const packer<Stream>& operator<< (
+	packer<Stream>& o,
+	const std::tuple<Args...>& v) {
+	o.pack_array(sizeof...(Args));
+	StdTuplePacker<Stream, decltype(v), sizeof...(Args)>::pack(o, v);
+	return o;
+}
+
+// --- Convert from tuple to object ---
+
+template <typename Tuple, std::size_t N>
+struct StdTupleConverter {
+	static void convert(
+		object const& o,
+		Tuple& v) {
+		StdTupleConverter<Tuple, N-1>::convert(o, v);
+		o.via.array.ptr[N-1].convert<typename std::remove_reference<decltype(std::get<N-1>(v))>::type>(std::get<N-1>(v));
+	}
+};
+
+template <typename Tuple>
+struct StdTupleConverter<Tuple, 1> {
+	static void convert (
+		object const& o,
+		Tuple& v) {
+		o.via.array.ptr[0].convert<typename std::remove_reference<decltype(std::get<0>(v))>::type>(std::get<0>(v));
+	}
+};
+
+template <typename... Args>
+std::tuple<Args...>& operator>> (
+	object const& o,
+	std::tuple<Args...>& v) {
+	if(o.type != type::ARRAY) { throw type_error(); }
+	if(o.via.array.size < sizeof...(Args)) { throw type_error(); }
+	StdTupleConverter<decltype(v), sizeof...(Args)>::convert(o, v);
+	return v;
+}
+
+// --- Convert from tuple to object with zone ---
+template <typename Tuple, std::size_t N>
+struct StdTupleToObjectWithZone {
+	static void convert(
+		object::with_zone& o,
+		const Tuple& v) {
+		StdTupleToObjectWithZone<Tuple, N-1>::convert(o, v);
+		o.via.array.ptr[N-1] = object(std::get<N-1>(v), o.zone);
+	}
+};
+
+template <typename Tuple>
+struct StdTupleToObjectWithZone<Tuple, 1> {
+	static void convert (
+		object::with_zone& o,
+		const Tuple& v) {
+		o.via.array.ptr[0] = object(std::get<0>(v), o.zone);
+	}
+};
+
+template <typename... Args>
+inline void operator<< (
+		object::with_zone& o,
+		std::tuple<Args...>& v) {
+	o.type = type::ARRAY;
+	o.via.array.ptr = static_cast<object*>(o.zone->allocate_align(sizeof(object)*sizeof...(Args)));
+	o.via.array.size = sizeof...(Args);
+	StdTupleToObjectWithZone<decltype(v), sizeof...(Args)>::convert(o, v);
+}
+
+} // msgpack
+
+#endif // MSGPACK_CPP11_TUPLE_HPP
+
diff --git a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
index 98041bb4..9f10ce7a 100644
--- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
+++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2008-2013 FURUHASHI Sadayuki and KONDO Takatoshi
+// Copyright (C) 2008-2014 FURUHASHI Sadayuki and KONDO Takatoshi
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -91,17 +91,17 @@ namespace type {
 
 // --- Pack ( from tuple to packer stream ---
 template <typename Stream, typename Tuple, std::size_t N>
-struct Packer {
+struct MsgpackTuplePacker {
 	static void pack(
 		packer<Stream>& o,
 		const Tuple& v) {
-		Packer<Stream, Tuple, N-1>::pack(o, v);
+		MsgpackTuplePacker<Stream, Tuple, N-1>::pack(o, v);
 		o.pack(type::get<N-1>(v));
 	}
 };
 
 template <typename Stream, typename Tuple>
-struct Packer<Stream, Tuple, 1> {
+struct MsgpackTuplePacker<Stream, Tuple, 1> {
 	static void pack (
 		packer<Stream>& o,
 		const Tuple& v) {
@@ -114,24 +114,24 @@ const packer<Stream>& operator<< (
 	packer<Stream>& o,
 	const type::tuple<Args...>& v) {
 	o.pack_array(sizeof...(Args));
-	Packer<Stream, decltype(v), sizeof...(Args)>::pack(o, v);
+	MsgpackTuplePacker<Stream, decltype(v), sizeof...(Args)>::pack(o, v);
 	return o;
 }
 
 // --- Convert from tuple to object ---
 
 template <typename Tuple, std::size_t N>
-struct Converter {
+struct MsgpackTupleConverter {
 	static void convert(
 		object const& o,
 		Tuple& v) {
-		Converter<Tuple, N-1>::convert(o, v);
+		MsgpackTupleConverter<Tuple, N-1>::convert(o, v);
 		o.via.array.ptr[N-1].convert<typename std::remove_reference<decltype(type::get<N-1>(v))>::type>(type::get<N-1>(v));
 	}
 };
 
 template <typename Tuple>
-struct Converter<Tuple, 1> {
+struct MsgpackTupleConverter<Tuple, 1> {
 	static void convert (
 		object const& o,
 		Tuple& v) {
@@ -145,23 +145,23 @@ type::tuple<Args...>& operator>> (
 	type::tuple<Args...>& v) {
 	if(o.type != type::ARRAY) { throw type_error(); }
 	if(o.via.array.size < sizeof...(Args)) { throw type_error(); }
-	Converter<decltype(v), sizeof...(Args)>::convert(o, v);
+	MsgpackTupleConverter<decltype(v), sizeof...(Args)>::convert(o, v);
 	return v;
 }
 
 // --- Convert from tuple to object with zone ---
 template <typename Tuple, std::size_t N>
-struct TupleToObjectWithZone {
+struct MsgpackTupleToObjectWithZone {
 	static void convert(
 		object::with_zone& o,
 		const Tuple& v) {
-		TupleToObjectWithZone<Tuple, N-1>::convert(o, v);
+		MsgpackTupleToObjectWithZone<Tuple, N-1>::convert(o, v);
 		o.via.array.ptr[N-1] = object(type::get<N-1>(v), o.zone);
 	}
 };
 
 template <typename Tuple>
-struct TupleToObjectWithZone<Tuple, 1> {
+struct MsgpackTupleToObjectWithZone<Tuple, 1> {
 	static void convert (
 		object::with_zone& o,
 		const Tuple& v) {
@@ -176,7 +176,7 @@ inline void operator<< (
 	o.type = type::ARRAY;
 	o.via.array.ptr = static_cast<object*>(o.zone->allocate_align(sizeof(object)*sizeof...(Args)));
 	o.via.array.size = sizeof...(Args);
-	TupleToObjectWithZone<decltype(v), sizeof...(Args)>::convert(o, v);
+	MsgpackTupleToObjectWithZone<decltype(v), sizeof...(Args)>::convert(o, v);
 }
 
 } // msgpack
diff --git a/include/msgpack/type.hpp b/include/msgpack/type.hpp
index 6a728623..b3da55d4 100644
--- a/include/msgpack/type.hpp
+++ b/include/msgpack/type.hpp
@@ -1,3 +1,4 @@
+#include "cpp_config.hpp"
 #include "adaptor/bool.hpp"
 #include "adaptor/deque.hpp"
 #include "adaptor/fixint.hpp"
@@ -15,3 +16,10 @@
 #include "adaptor/define.hpp"
 #include "adaptor/tr1/unordered_map.hpp"
 #include "adaptor/tr1/unordered_set.hpp"
+
+#if !defined(MSGPACK_USE_CPP03)
+
+#include "adaptor/cpp11/tuple.hpp"
+
+#endif // !defined(MSGPACK_USE_CPP03)
+
diff --git a/test/msgpack_test.cpp b/test/msgpack_test.cpp
index 9673ed91..e3b67ee7 100644
--- a/test/msgpack_test.cpp
+++ b/test/msgpack_test.cpp
@@ -740,6 +740,26 @@ TEST(MSGPACK_TR1, simple_buffer_unordered_multiset)
 }
 #endif
 
+#if !defined(MSGPACK_USE_CPP03)
+// C++11
+
+TEST(MSGPACK_CPP11, simple_tuple)
+{
+  msgpack::sbuffer sbuf;
+  std::tuple<bool, std::string, double> val1(true, "kzk", 12.3);
+  msgpack::pack(sbuf, val1);
+  msgpack::zone z;
+  msgpack::object obj;
+  msgpack::unpack_return ret =
+    msgpack::unpack(sbuf.data(), sbuf.size(), NULL, z, obj);
+  EXPECT_EQ(msgpack::UNPACK_SUCCESS, ret);
+  std::tuple<bool, std::string, double> val2;
+  obj.convert(&val2);
+  EXPECT_EQ(val1, val2);
+}
+
+#endif // !defined(MSGPACK_USE_CPP03)
+
 // User-Defined Structures
 
 class TestClass