diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index 83a49eb8e..b8376b8ed 100644
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -328,6 +328,37 @@ wincaps wincap_10_1903 __attribute__((section (".cygwin_dll_common"), shared)) =
   },
 };
 
+wincaps wincap_10_2004 __attribute__((section (".cygwin_dll_common"), shared)) = {
+  def_guard_pages:2,
+  mmap_storage_high:0x700000000000LL,
+  {
+    is_server:false,
+    needs_query_information:false,
+    has_gaa_largeaddress_bug:false,
+    has_precise_system_time:true,
+    has_microsoft_accounts:true,
+    has_broken_prefetchvm:false,
+    has_new_pebteb_region:true,
+    has_broken_whoami:false,
+    has_unprivileged_createsymlink:true,
+    has_precise_interrupt_time:true,
+    has_posix_unlink_semantics:true,
+    has_posix_unlink_semantics_with_ignore_readonly:true,
+    has_case_sensitive_dirs:true,
+    has_posix_rename_semantics:true,
+    no_msv1_0_s4u_logon_in_wow64:false,
+    has_con_24bit_colors:true,
+    has_con_broken_csi3j:false,
+    has_con_broken_il_dl:false,
+    has_con_esc_rep:true,
+    has_extended_mem_api:true,
+    has_tcp_fastopen:true,
+    has_linux_tcp_keepalive_sockopts:true,
+    has_tcp_maxrtms:true,
+    has_query_process_handle_info:true,
+  },
+};
+
 wincapc wincap __attribute__((section (".cygwin_dll_common"), shared));
 
 void
@@ -365,7 +396,9 @@ wincapc::init ()
 	break;
       case 10:
       default:
-	if (likely (version.dwBuildNumber >= 18362))
+	if (likely (version.dwBuildNumber >= 19041))
+	  caps = &wincap_10_2004;
+	else if (version.dwBuildNumber >= 18362)
 	  caps = &wincap_10_1903;
 	else if (version.dwBuildNumber >= 17763)
 	  caps = &wincap_10_1809;