diff --git a/configure b/configure
index b6d22f896ea..ce3ecb0fee4 100755
--- a/configure
+++ b/configure
@@ -1517,6 +1517,7 @@ enable_msvcp120
 enable_msvcp120_app
 enable_msvcp140
 enable_msvcp140_1
+enable_msvcp140_atomic_wait
 enable_msvcp60
 enable_msvcp70
 enable_msvcp71
@@ -22130,6 +22131,7 @@ wine_fn_config_makefile dlls/msvcp140 enable_msvcp140
 wine_fn_config_makefile dlls/msvcp140/tests enable_tests
 wine_fn_config_makefile dlls/msvcp140_1 enable_msvcp140_1
 wine_fn_config_makefile dlls/msvcp140_1/tests enable_tests
+wine_fn_config_makefile dlls/msvcp140_atomic_wait enable_msvcp140_atomic_wait
 wine_fn_config_makefile dlls/msvcp60 enable_msvcp60
 wine_fn_config_makefile dlls/msvcp60/tests enable_tests
 wine_fn_config_makefile dlls/msvcp70 enable_msvcp70
diff --git a/configure.ac b/configure.ac
index 0b1a53f3ff9..bf590be0072 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3055,6 +3055,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp140)
 WINE_CONFIG_MAKEFILE(dlls/msvcp140/tests)
 WINE_CONFIG_MAKEFILE(dlls/msvcp140_1)
 WINE_CONFIG_MAKEFILE(dlls/msvcp140_1/tests)
+WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait)
 WINE_CONFIG_MAKEFILE(dlls/msvcp60)
 WINE_CONFIG_MAKEFILE(dlls/msvcp60/tests)
 WINE_CONFIG_MAKEFILE(dlls/msvcp70)
diff --git a/dlls/msvcp140_atomic_wait/Makefile.in b/dlls/msvcp140_atomic_wait/Makefile.in
new file mode 100644
index 00000000000..0d1aac64b53
--- /dev/null
+++ b/dlls/msvcp140_atomic_wait/Makefile.in
@@ -0,0 +1 @@
+MODULE  = msvcp140_atomic_wait.dll
diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec
new file mode 100644
index 00000000000..34ca996f2f5
--- /dev/null
+++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec
@@ -0,0 +1,32 @@
+@ stub __std_acquire_shared_mutex_for_instance
+@ stub __std_atomic_compare_exchange_128
+@ stub __std_atomic_get_mutex
+@ stub __std_atomic_has_cmpxchg16b
+@ stub __std_atomic_notify_all_direct
+@ stub __std_atomic_notify_all_indirect
+@ stub __std_atomic_notify_one_direct
+@ stub __std_atomic_notify_one_indirect
+@ stub __std_atomic_set_api_level
+@ stub __std_atomic_wait_direct
+@ stub __std_atomic_wait_get_deadline
+@ stub __std_atomic_wait_get_remaining_timeout
+@ stub __std_atomic_wait_indirect
+@ stub __std_bulk_submit_threadpool_work
+@ stub __std_calloc_crt
+@ stub __std_close_threadpool_work
+@ stub __std_create_threadpool_work
+@ stub __std_execution_wait_on_uchar
+@ stub __std_execution_wake_by_address_all
+@ stub __std_free_crt
+@ stub __std_parallel_algorithms_hw_threads
+@ stub __std_release_shared_mutex_for_instance
+@ stub __std_submit_threadpool_work
+@ stub __std_tzdb_delete_current_zone
+@ stub __std_tzdb_delete_leap_seconds
+@ stub __std_tzdb_delete_sys_info
+@ stub __std_tzdb_delete_time_zones
+@ stub __std_tzdb_get_current_zone
+@ stub __std_tzdb_get_leap_seconds
+@ stub __std_tzdb_get_sys_info
+@ stub __std_tzdb_get_time_zones
+@ stub __std_wait_for_threadpool_work_callbacks