diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16633f01f..c6efce267 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -667,6 +667,11 @@ CHECK_LIBRARY_EXISTS(cap cap_set_flag "" LWS_HAVE_LIBCAP)
 
 if (LWS_WITH_LIBUV)
 CHECK_INCLUDE_FILE(uv-version.h LWS_HAVE_UV_VERSION_H)
+  # libuv changed the location in 1.21.0. Retain both
+  # checks temporarily to ensure a smooth transition.
+  if(NOT LWS_HAVE_UV_VERSION_H)
+    CHECK_INCLUDE_FILE(uv/version.h LWS_HAVE_NEW_UV_VERSION_H)
+  endif()
 endif()
 
 
diff --git a/cmake/lws_config.h.in b/cmake/lws_config.h.in
index a108da73c..ea5367c9e 100644
--- a/cmake/lws_config.h.in
+++ b/cmake/lws_config.h.in
@@ -109,6 +109,7 @@
 #cmakedefine LWS_HAVE_SSL_CTX_get0_certificate
 
 #cmakedefine LWS_HAVE_UV_VERSION_H
+#cmakedefine LWS_HAVE_NEW_UV_VERSION_H
 #cmakedefine LWS_HAVE_PTHREAD_H
 
 /* CGI apis */