diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c
index 2c97c429..8b72f255 100644
--- a/zsnes/src/linux/sdllink.c
+++ b/zsnes/src/linux/sdllink.c
@@ -552,6 +552,7 @@ BOOL InitJoystickInput(void)
 	// If it is possible to use SDL_NumJoysticks
 	// before initialising SDL_INIT_JOYSTICK then
 	// this call can be replaced with SDL_InitSubSystem
+	SDL_InitSubSystem (SDL_INIT_JOYSTICK);
 	max_num_joysticks = SDL_NumJoysticks();
 	if (!max_num_joysticks)
 	{
@@ -586,7 +587,7 @@ int startgame(void)
 	if (sdl_state != vid_null)
 	{
 		if (SDL_Init(SDL_INIT_AUDIO | SDL_INIT_TIMER |
-	        SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0)
+	        SDL_INIT_VIDEO) < 0)
 		{
 			fprintf(stderr, "Could not initialize SDL!\n");
 			return FALSE;