diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 563b769f200..68c56b10207 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2018-01-04  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+	Backport from mainline
+	2018-01-03  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+	Protect optional's deduction guide with the feature macro
+	* include/std/optional: Use the feature macro.
+
 2017-12-28  François Dumont  <fdumont@gcc.gnu.org>
 
 	Backport from mainline
diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional
index 9e3f1f75fcd..49ed8632227 100644
--- a/libstdc++-v3/include/std/optional
+++ b/libstdc++-v3/include/std/optional
@@ -1031,7 +1031,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /// @}
 
+#if __cpp_deduction_guides >= 201606
   template <typename _Tp> optional(_Tp) -> optional<_Tp>;
+#endif
 
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std