diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 1019aeae740..99006434e2d 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-09  Jason Merrill  <jason@redhat.com>
+
+	* c.opt (std=c++14): Remove Undocumented flag and experimental warning.
+	(std=gnu++0x): Mark as Undocumented.
+	(std=gnu++1y): Add deprecated message.
+
 2015-05-08  Jason Merrill  <jason@redhat.com>
 
 	* c.opt (Wc++11-compat): Make primary.  Rename var warn_cxx11_compat.
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index e244a6db06e..343a599e3b9 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -1591,8 +1591,8 @@ C++ ObjC++ Alias(std=c++14) Undocumented
 Deprecated in favor of -std=c++14
 
 std=c++14
-C++ ObjC++ Undocumented
-Conform to the ISO 2014 C++ standard (experimental and incomplete support)
+C++ ObjC++
+Conform to the ISO 2014 C++ standard
 
 std=c++1z
 C++ ObjC++
@@ -1640,11 +1640,12 @@ C++ ObjC++
 Conform to the ISO 2011 C++ standard with GNU extensions (experimental and incomplete support)
 
 std=gnu++0x
-C++ ObjC++ Alias(std=gnu++11)
+C++ ObjC++ Alias(std=gnu++11) Undocumented
 Deprecated in favor of -std=gnu++11
 
 std=gnu++1y
 C++ ObjC++ Alias(std=gnu++14) Undocumented
+Deprecated in favor of -std=gnu++14
 
 std=gnu++14
 C++ ObjC++