diff --git a/include/boost/core/type_name.hpp b/include/boost/core/type_name.hpp
index 9a82dd3..dfdedd3 100644
--- a/include/boost/core/type_name.hpp
+++ b/include/boost/core/type_name.hpp
@@ -14,6 +14,7 @@
 // https://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/core/demangle.hpp>
+#include <boost/core/is_same.hpp>
 #include <boost/config.hpp>
 #include <string>
 #include <functional>
@@ -73,6 +74,24 @@ template<class T> struct tn_is_reference<T&&>
 
 #endif
 
+// tn_remove_const
+
+template<class T> struct tn_remove_const
+{
+    typedef T type;
+};
+
+template<class T> struct tn_remove_const<T const>
+{
+    typedef T type;
+};
+
+// tn_is_function (also catches references but that's OK)
+
+template<class T, class U = typename tn_remove_const<T>::type> struct tn_is_function: core::is_same<U, U const>
+{
+};
+
 #if !defined(BOOST_NO_TYPEID)
 
 // typeid_name
@@ -261,21 +280,21 @@ template<class T> std::string type_name( tn_identity<T const volatile> )
 #else
 
 template<class T>
-typename tn_enable_if<!tn_is_reference<T>::value, std::string>::type
+typename tn_enable_if<!tn_is_function<T>::value, std::string>::type
 type_name( tn_identity<T const> )
 {
     return type_name( tn_identity<T>() ) + " const";
 }
 
 template<class T>
-typename tn_enable_if<!tn_is_reference<T>::value, std::string>::type
+typename tn_enable_if<!tn_is_function<T>::value, std::string>::type
 type_name( tn_identity<T volatile> )
 {
     return type_name( tn_identity<T>() ) + " volatile";
 }
 
 template<class T>
-typename tn_enable_if<!tn_is_reference<T>::value, std::string>::type
+typename tn_enable_if<!tn_is_function<T>::value, std::string>::type
 type_name( tn_identity<T const volatile> )
 {
     return type_name( tn_identity<T>() ) + " const volatile";
@@ -332,6 +351,22 @@ template<class T> std::string type_name( tn_identity<T*> )
 
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
+// function references
+
+template<class R, class... A> std::string type_name( tn_identity<R(&)(A...)> )
+{
+    return type_name( tn_identity<R>() ) + "(&)(" + tn_add_each<A...>() + ')';
+}
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+
+template<class R, class... A> std::string type_name( tn_identity<R(&&)(A...)> )
+{
+    return type_name( tn_identity<R>() ) + "(&&)(" + tn_add_each<A...>() + ')';
+}
+
+#endif
+
 // function pointers
 
 template<class R, class... A> std::string type_name( tn_identity<R(*)(A...)> )
diff --git a/test/type_name_test.cpp b/test/type_name_test.cpp
index 6ab08f5..b3439c1 100644
--- a/test/type_name_test.cpp
+++ b/test/type_name_test.cpp
@@ -105,6 +105,21 @@ int main()
     TEST(void*);
     TEST(void const* volatile*);
 
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+
+    TEST(void());
+    TEST(int(float, A, B*));
+
+    TEST(void(*)());
+    TEST(void(&)());
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+
+    TEST(void(&&)());
+
+#endif
+#endif
+
     TEST(A[]);
     TEST(A const[]);
     TEST(A volatile[]);