diff --git a/LICENSE b/LICENSE
index 59b9a7b..2e3216f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,7 @@
 BSD 2-Clause License
 
 Copyright (c) 2013-2022, Valve Corporation
+Copyright (c) 2022, NVIDIA CORPORATION
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/main.cpp b/src/main.cpp
index 48f63a8..17c5c67 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,8 @@
 #include <cstring>
 #include <sys/capability.h>
 #include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 
 #include <getopt.h>
 #include <signal.h>
@@ -212,6 +214,51 @@ static void handle_signal( int sig )
 	}
 }
 
+static struct rlimit g_originalFdLimit;
+static bool g_fdLimitRaised = false;
+
+void restore_fd_limit( void )
+{
+	if (!g_fdLimitRaised) {
+		return;
+	}
+
+	if ( setrlimit( RLIMIT_NOFILE, &g_originalFdLimit ) )
+	{
+		fprintf( stderr, "Failed to reset the maximum number of open files in child process\n" );
+		fprintf( stderr, "Use of select() may fail.\n" );
+	}
+
+	g_fdLimitRaised = false;
+}
+
+static void raise_fd_limit( void )
+{
+	struct rlimit newFdLimit;
+
+	memset(&g_originalFdLimit, 0, sizeof(g_originalFdLimit));
+	if ( getrlimit( RLIMIT_NOFILE, &g_originalFdLimit ) != 0 )
+	{
+		fprintf( stderr, "Could not query maximum number of open files. Leaving at default value.\n" );
+		return;
+	}
+
+	if ( g_originalFdLimit.rlim_cur >= g_originalFdLimit.rlim_max )
+	{
+		return;
+	}
+
+	memcpy(&newFdLimit, &g_originalFdLimit, sizeof(newFdLimit));
+	newFdLimit.rlim_cur = newFdLimit.rlim_max;
+
+	if ( setrlimit( RLIMIT_NOFILE, &newFdLimit ) )
+	{
+		fprintf( stderr, "Failed to raise the maximum number of open files. Leaving at default value.\n" );
+	}
+
+	g_fdLimitRaised = true;
+}
+
 int g_nPreferredOutputWidth = 0;
 int g_nPreferredOutputHeight = 0;
 
@@ -326,6 +373,8 @@ int main(int argc, char **argv)
 		fprintf( stderr, "No CAP_SYS_NICE, falling back to regular-priority compute and threads.\nPerformance will be affected.\n" );
 	}
 
+	raise_fd_limit();
+
 	if ( gpuvis_trace_init() != -1 )
 	{
 		fprintf( stderr, "Tracing is enabled\n");
diff --git a/src/main.hpp b/src/main.hpp
index 24967cd..fdfd996 100644
--- a/src/main.hpp
+++ b/src/main.hpp
@@ -33,4 +33,5 @@ extern int g_nNewNice;
 
 extern int g_nXWaylandCount;
 
+void restore_fd_limit( void );
 bool BIsNested( void );
diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
index 844e54f..9aedb96 100644
--- a/src/steamcompmgr.cpp
+++ b/src/steamcompmgr.cpp
@@ -4368,6 +4368,9 @@ spawn_client( char **argv )
 			nice( g_nOldNice - g_nNewNice );
 		}
 
+		// Restore prior rlimit in case child uses select()
+		restore_fd_limit();
+
 		// Set modified LD_PRELOAD if needed
 		if ( pchCurrentPreload != nullptr )
 		{