diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp
index f9699d0..42b7d0f 100644
--- a/include/boost/function/function_template.hpp
+++ b/include/boost/function/function_template.hpp
@@ -749,7 +749,7 @@ namespace boost {
       this->assign_to_own(f);
     }
     
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     BOOST_FUNCTION_FUNCTION(BOOST_FUNCTION_FUNCTION&& f) : function_base()
     {
       this->move_assign(f);
@@ -838,7 +838,7 @@ namespace boost {
       return *this;
     }
     
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     // Move assignment from another BOOST_FUNCTION_FUNCTION
     BOOST_FUNCTION_FUNCTION& operator=(BOOST_FUNCTION_FUNCTION&& f)
     {
@@ -1090,7 +1090,7 @@ public:
 
   function(const base_type& f) : base_type(static_cast<const base_type&>(f)){}
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   // Move constructors
   function(self_type&& f): base_type(static_cast<base_type&&>(f)){}
   function(base_type&& f): base_type(static_cast<base_type&&>(f)){}
@@ -1102,7 +1102,7 @@ public:
     return *this;
   }
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   self_type& operator=(self_type&& f)
   {
     self_type(static_cast<self_type&&>(f)).swap(*this);
@@ -1139,7 +1139,7 @@ public:
     return *this;
   }
   
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   self_type& operator=(base_type&& f)
   {
     self_type(static_cast<base_type&&>(f)).swap(*this);
diff --git a/test/function_test.cpp b/test/function_test.cpp
index 7f5cb04..02a60ce 100644
--- a/test/function_test.cpp
+++ b/test/function_test.cpp
@@ -733,7 +733,7 @@ static void test_move_semantics()
   BOOST_CHECK(!f1.empty());
   BOOST_CHECK(global_int == 1);
   
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   // Testing rvalue constructors
   f1_type f2(static_cast<f1_type&&>(f1));
   BOOST_CHECK(f1.empty());