diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e3a84c5a1f0..f5246fe0577 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-13  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/bits/allocated_ptr.h (__allocated_ptr::_S_raw_ptr): Make
+	static.
+
 2016-07-13  Jonathan Wakely  <jwakely@redhat.com>
 
 	Revert "Add non-const overload of std::string::data()".
diff --git a/libstdc++-v3/include/bits/allocated_ptr.h b/libstdc++-v3/include/bits/allocated_ptr.h
index 2bd9d82fd03..97e26662432 100644
--- a/libstdc++-v3/include/bits/allocated_ptr.h
+++ b/libstdc++-v3/include/bits/allocated_ptr.h
@@ -85,10 +85,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       value_type* get() { return _S_raw_ptr(_M_ptr); }
 
     private:
-      value_type* _S_raw_ptr(value_type* __ptr) { return __ptr; }
+      static value_type* _S_raw_ptr(value_type* __ptr) { return __ptr; }
 
       template<typename _Ptr>
-	auto _S_raw_ptr(_Ptr __ptr) -> decltype(_S_raw_ptr(__ptr.operator->()))
+	static auto
+	_S_raw_ptr(_Ptr __ptr) -> decltype(_S_raw_ptr(__ptr.operator->()))
 	{ return _S_raw_ptr(__ptr.operator->()); }
 
       _Alloc* _M_alloc;