diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b5dc52c66d2bbaa98fdcc27149bfe21265eeac91..52535464984d040e1910cbf7c0df4ee06c62f86d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-23  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/std/version (__cpp_lib_three_way_comparison): Define for
+	freestanding builds.
+
 2020-04-23  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* include/std/coroutine: Update the inline namespace to __n4861.
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index d06d60c9106927582c91dabe737abe67417d038b..1beb9aa938ef0ae6033328e9f9ddc7d6a07edf3a 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -184,6 +184,9 @@
 #endif
 #define __cpp_lib_is_nothrow_convertible 201806L
 #define __cpp_lib_remove_cvref 201711L
+#if __cpp_impl_three_way_comparison >= 201907L && __cpp_lib_concepts
+# define __cpp_lib_three_way_comparison 201907L
+#endif
 #define __cpp_lib_type_identity 201806L
 #define __cpp_lib_unwrap_ref 201811L
 
@@ -215,9 +218,6 @@
 #define __cpp_lib_span 202002L
 #define __cpp_lib_ssize 201902L
 #define __cpp_lib_starts_ends_with 201711L
-#if __cpp_impl_three_way_comparison >= 201907L && __cpp_lib_concepts
-# define __cpp_lib_three_way_comparison 201907L
-#endif
 #define __cpp_lib_to_address 201711L
 #define __cpp_lib_to_array 201907L
 #endif