diff --git a/include/sqlpp11/concat.h b/include/sqlpp11/concat.h
new file mode 100644
index 00000000..c760a8a7
--- /dev/null
+++ b/include/sqlpp11/concat.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2013, Roland Bock
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * 
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * 
+ *   Redistributions in binary form must reproduce the above copyright notice, this
+ *   list of conditions and the following disclaimer in the documentation and/or
+ *   other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SQLPP_CONCAT_H
+#define SQLPP_CONCAT_H
+
+#include <sstream>
+#include <sqlpp11/text.h>
+
+namespace sqlpp
+{
+	namespace detail
+	{
+		struct text;
+
+		template<typename Text, typename... Args>
+		struct concat_t: public Text::template operators<concat_t<Args...>>
+		{
+			using _valid_args = typename detail::make_set_if<is_text_t, Args...>::type;
+			static_assert(_valid_args::size::value == sizeof...(Args), "at least one non-text argument detected in concat()");
+
+			using _value_type = Text;
+			struct _name_t
+			{
+				static constexpr const char* _get_name() { return "CONCAT"; }
+				template<typename T>
+					struct _member_t
+					{
+						T concat;
+					};
+			};
+
+			concat_t(Args&&... args):
+				_args(std::move(args)...)
+			{}
+
+			concat_t(const Args&... args):
+				_args(args...)
+			{}
+
+			concat_t(const concat_t&) = default;
+			concat_t(concat_t&&) = default;
+			concat_t& operator=(const concat_t&) = default;
+			concat_t& operator=(concat_t&&) = default;
+			~concat_t() = default;
+
+			template<typename Db>
+				void serialize(std::ostream& os, Db& db) const
+				{
+					os << "CONCAT(";
+					detail::serialize_tuple(os, db, _args, ',');
+					os << ")";
+				}
+
+		private:
+			std::tuple<Args...> _args;
+		};
+	}
+
+	template<typename... T>
+	auto concat(T&&... t) -> typename detail::concat_t<detail::text, typename std::decay<T>::type...>::type
+	{
+		return { std::forward<T>(t)... };
+	}
+
+}
+
+#endif
diff --git a/include/sqlpp11/text.h b/include/sqlpp11/text.h
index 9c2be615..40ec2f3a 100644
--- a/include/sqlpp11/text.h
+++ b/include/sqlpp11/text.h
@@ -32,17 +32,13 @@
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/raw_result_row.h>
 #include <sqlpp11/exception.h>
+#include <sqlpp11/concat.h>
 
 namespace sqlpp
 {
 	namespace detail
 	{
 		struct text;
-		struct concat_
-		{
-			using _value_type = detail::text;
-			static constexpr const char* _name = "CONCAT";
-		};
 
 		struct like_
 		{
@@ -122,7 +118,7 @@ namespace sqlpp
 			{
 
 				template<typename T>
-					nary_function_t<concat_, Base, typename _constraint<T>::type> operator+(T&& t) const
+					detail::concat_t<Base, Base, typename _constraint<T>::type> operator+(T&& t) const
 					{
 						return { *static_cast<const Base*>(this), std::forward<T>(t) };
 					}