diff --git a/src/hb-algs.hh b/src/hb-algs.hh
index b6ed7e958..34c376893 100644
--- a/src/hb-algs.hh
+++ b/src/hb-algs.hh
@@ -496,7 +496,7 @@ struct hb_pair_t
 	    hb_enable_if (std::is_default_constructible<U1>::value &&
 			  std::is_default_constructible<U2>::value)>
   hb_pair_t () : first (), second () {}
-  hb_pair_t (T1 a, T2 b) : first (a), second (b) {}
+  hb_pair_t (T1 a, T2 b) : first (std::forward<T1> (a)), second (std::forward<T2> (b)) {}
 
   template <typename Q1, typename Q2,
 	    hb_enable_if (hb_is_convertible (T1, Q1) &&
diff --git a/src/hb-map.hh b/src/hb-map.hh
index 348882cc9..c88ca8cc3 100644
--- a/src/hb-map.hh
+++ b/src/hb-map.hh
@@ -315,6 +315,8 @@ struct hb_hashmap_t
   /* Sink interface. */
   hb_hashmap_t& operator << (const hb_pair_t<K, V>& v)
   { set (v.first, v.second); return *this; }
+  hb_hashmap_t& operator << (const hb_pair_t<K, V&&>& v)
+  { set (v.first, std::move (v.second)); return *this; }
 
   protected:
 
diff --git a/src/test-map.cc b/src/test-map.cc
index fa2752591..2127393f1 100644
--- a/src/test-map.cc
+++ b/src/test-map.cc
@@ -179,10 +179,18 @@ main (int argc, char **argv)
 
     hb_hashmap_t<vector_t, vector_t> m1;
 
-    m1 << hb_pair_t<vector_t, vector_t> {vector_t (), vector_t ()};
     m1.set (vector_t (), vector_t {1});
     m1.set (vector_t {1}, vector_t {2});
 
+    m1 << hb_pair_t<vector_t, vector_t> {vector_t {2}, vector_t ()};
+
+    vector_t v {3};
+    assert (v.length == 1);
+    m1 << hb_pair_t<vector_t, vector_t> {vector_t {3}, v};
+    assert (v.length == 1);
+    m1 << hb_pair_t<vector_t, vector_t&&> {vector_t {4}, std::move (v)};
+    assert (v.length == 0);
+
     assert (m1.get (vector_t ()) == vector_t {1});
     assert (m1.get (vector_t {1}) == vector_t {2});
   }