diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c
index 2fe7e7dc..86dbadb0 100644
--- a/code/client/snd_openal.c
+++ b/code/client/snd_openal.c
@@ -2390,7 +2390,7 @@ qboolean S_AL_Init( soundInterface_t *si )
 	   qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT")
 	  )
 	{
-		char devicenames[1024] = "";
+		char devicenames[16384] = "";
 		const char *devicelist;
 		const char *defaultdevice;
 		int curlen;
@@ -2494,7 +2494,7 @@ qboolean S_AL_Init( soundInterface_t *si )
 		}
 		else
 		{
-			char inputdevicenames[1024] = "";
+			char inputdevicenames[16384] = "";
 			const char *inputdevicelist;
 			const char *defaultinputdevice;
 			int curlen;
diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 00818ebe..7d28eeec 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -574,7 +574,7 @@ static void IN_InitJoystick( void )
 {
 	int i = 0;
 	int total = 0;
-	char buf[MAX_STRING_CHARS] = "";
+	char buf[16384] = "";
 
 	if (stick != NULL)
 		SDL_JoystickClose(stick);