diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp
index 7ee8f138f..a40923d7b 100644
--- a/src/win32/i_input.cpp
+++ b/src/win32/i_input.cpp
@@ -101,6 +101,7 @@
 #include "cmdlib.h"
 #include "d_event.h"
 #include "v_text.h"
+#include "version.h"
 
 // Prototypes and declarations.
 #include "rawinput.h"
@@ -159,6 +160,11 @@ int SessionState = 0;
 
 CVAR (Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 
+CUSTOM_CVAR(Bool, norawinput, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL)
+{
+	Printf("This won't take effect until "GAMENAME" is restarted.\n");
+}
+
 extern int chatmodeon;
 
 static void I_CheckGUICapture ()
@@ -592,7 +598,7 @@ bool I_InitInput (void *hwnd)
 	g_pdi = NULL;
 	g_pdi3 = NULL;
 
-	FindRawInputFunctions();
+	if (!norawinput) FindRawInputFunctions();
 
 	// Try for DirectInput 8 first, then DirectInput 3 for NT 4's benefit.
 	DInputDLL = LoadLibrary("dinput8.dll");