diff --git a/doc/changes.qbk b/doc/changes.qbk
index 8fd4c2a9..07163a6a 100644
--- a/doc/changes.qbk
+++ b/doc/changes.qbk
@@ -33,4 +33,9 @@ First official release.
   are available.
 * Added equality operators.
 
+[h2 Development...]
+
+* Rename overload of `emplace` with hint, to `emplace_hint` as specified in
+  [@http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2008/n2691.pdf n2691].
+
 [endsect]
diff --git a/doc/ref.xml b/doc/ref.xml
index d7dd9259..1600042b 100644
--- a/doc/ref.xml
+++ b/doc/ref.xml
@@ -287,7 +287,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
                 <para>Only available on compilers with support for variadic template arguments and rvalue references.</para>
               </notes>
             </method>
-            <method name="emplace">
+            <method name="emplace_hint">
               <template>
                 <template-type-parameter name="Args" pack="1">
                 </template-type-parameter>
@@ -1016,7 +1016,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
                 <para>Only available on compilers with support for variadic template arguments and rvalue references.</para>
               </notes>
             </method>
-            <method name="emplace">
+            <method name="emplace_hint">
               <template>
                 <template-type-parameter name="Args" pack="1">
                 </template-type-parameter>
@@ -1757,7 +1757,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
                 <para>Only available on compilers with support for variadic template arguments and rvalue references.</para>
               </notes>
             </method>
-            <method name="emplace">
+            <method name="emplace_hint">
               <template>
                 <template-type-parameter name="Args" pack="1">
                 </template-type-parameter>
@@ -2535,7 +2535,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
                 <para>Only available on compilers with support for variadic template arguments and rvalue references.</para>
               </notes>
             </method>
-            <method name="emplace">
+            <method name="emplace_hint">
               <template>
                 <template-type-parameter name="Args" pack="1">
                 </template-type-parameter>
diff --git a/include/boost/unordered_map.hpp b/include/boost/unordered_map.hpp
index 484cf42f..d675f07a 100644
--- a/include/boost/unordered_map.hpp
+++ b/include/boost/unordered_map.hpp
@@ -237,7 +237,7 @@ namespace boost
         }
 
         template <class... Args>
-        iterator emplace(const_iterator hint, Args&&... args)
+        iterator emplace_hint(const_iterator hint, Args&&... args)
         {
             return iterator(base.insert_hint(get(hint), std::forward<Args>(args)...));
         }
@@ -625,7 +625,7 @@ namespace boost
         }
 
         template <class... Args>
-        iterator emplace(const_iterator hint, Args&&... args)
+        iterator emplace_hint(const_iterator hint, Args&&... args)
         {
             return iterator(base.insert_hint(get(hint), std::forward<Args>(args)...));
         }
diff --git a/include/boost/unordered_set.hpp b/include/boost/unordered_set.hpp
index 5b82f002..4b850685 100644
--- a/include/boost/unordered_set.hpp
+++ b/include/boost/unordered_set.hpp
@@ -233,7 +233,7 @@ namespace boost
         }
 
         template <class... Args>
-        iterator emplace(const_iterator hint, Args&&... args)
+        iterator emplace_hint(const_iterator hint, Args&&... args)
         {
             return iterator(
                 base.insert_hint(get(hint), std::forward<Args>(args)...));
@@ -592,7 +592,7 @@ namespace boost
         }
 
         template <class... Args>
-        iterator emplace(const_iterator hint, Args&&... args)
+        iterator emplace_hint(const_iterator hint, Args&&... args)
         {
             return iterator(base.insert_hint(get(hint), std::forward<Args>(args)...));
         }
diff --git a/test/unordered/compile_tests.hpp b/test/unordered/compile_tests.hpp
index 34265fca..9ace8597 100644
--- a/test/unordered/compile_tests.hpp
+++ b/test/unordered/compile_tests.hpp
@@ -290,7 +290,7 @@ void unordered_test(X&, Key& k, T& t, Hash& hf, Pred& eq)
     const_iterator q = a.cbegin();
     test::check_return_type<iterator>::equals(a.insert(q, t));
 #if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
-    test::check_return_type<iterator>::equals(a.emplace(q, t));
+    test::check_return_type<iterator>::equals(a.emplace_hint(q, t));
 #endif
 
     a.insert(i, j);