diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d9908b6d8fd..2aaf4a5d8cc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2019-08-14  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/std/type_traits (__is_nullptr_t): Add deprecated attribute.
+
 2019-08-14  Edward Smith-Rowland  <3dw4rd@verizon.net>
 
 	Implement C++20 p0879 - Constexpr for swap and swap related functions.
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index b31c26ab381..d3f853d4ce2 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -597,11 +597,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     : public __is_null_pointer_helper<typename remove_cv<_Tp>::type>::type
     { };
 
-  /// __is_nullptr_t (extension).
+  /// __is_nullptr_t (deprecated extension).
   template<typename _Tp>
     struct __is_nullptr_t
     : public is_null_pointer<_Tp>
-    { };
+    { } _GLIBCXX_DEPRECATED;
 
   // Composite type categories.