diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt
index a58e007907..da2c37250e 100644
--- a/layersvt/CMakeLists.txt
+++ b/layersvt/CMakeLists.txt
@@ -116,6 +116,7 @@ if(BUILD_SCREENSHOT)
         vk_layer_table.cpp
         vk_layer_table.h
         screenshot_layer.md
+        layer_keep_alive.cpp
         json/VkLayer_screenshot.json.in
     )
 endif()
diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp
index 6b70f1b1b4..0182681253 100644
--- a/layersvt/screenshot.cpp
+++ b/layersvt/screenshot.cpp
@@ -47,6 +47,11 @@
 #include <crtdbg.h>
 #endif
 
+#if defined(__ANDROID__) || defined(__linux__)
+#include <pthread.h>
+#include <string.h>
+#endif
+
 #ifdef ANDROID
 #include <android/trace.h>
 #include <android/log.h>
@@ -1660,6 +1665,12 @@ VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainImagesKHR(VkDevice device, VkSwapchai
 }
 
 void screenshotWriterThreadFunc() {
+#if defined(__ANDROID__) || defined(__linux__)
+    char buf[16] = {};
+    snprintf(buf, sizeof(buf), "VkScreenshot");
+    pthread_setname_np(pthread_self(), buf);
+#endif
+
     if (!std::atomic_load(&pauseCapture)) {
         screenshotWriter->setInProgress();
     }