diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp
index 3894f25e1b4..43d4cbf6a6c 100644
--- a/src/osd/modules/input/input_sdl.cpp
+++ b/src/osd/modules/input/input_sdl.cpp
@@ -688,11 +688,20 @@ public:
 		int physical_stick;
 		for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
 		{
-			SDL_Joystick *joy = SDL_JoystickOpen(physical_stick);
-			std::string joy_name = remove_spaces(SDL_JoystickName(joy));
-			SDL_JoystickClose(joy);
-
-			devmap_register(&m_joy_map, physical_stick, joy_name.c_str());
+		    if (SDL_IsGameController(physical_stick)) {
+				osd_printf_verbose("Joystick %i is supported by the game controller interface!\n", physical_stick);
+				osd_printf_verbose("Compatible controller, named \'%s\'\n", SDL_GameControllerNameForIndex(physical_stick));
+				SDL_GameController  *joy = SDL_GameControllerOpen(physical_stick);
+				osd_printf_verbose("Controller is mapped as \"%s\".\n", SDL_GameControllerMapping(joy));
+				std::string joy_name = remove_spaces(SDL_GameControllerName(joy));
+				SDL_GameControllerClose(joy);
+				devmap_register(&m_joy_map, physical_stick, joy_name.c_str());
+			} else {
+				SDL_Joystick *joy = SDL_JoystickOpen(physical_stick);
+				std::string joy_name = remove_spaces(SDL_JoystickName(joy));
+				SDL_JoystickClose(joy);
+				devmap_register(&m_joy_map, physical_stick, joy_name.c_str());
+			}
 		}
 
 		for (int stick = 0; stick < MAX_DEVMAP_ENTRIES; stick++)
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index 1a52a105fd5..66bca69b1cf 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -270,8 +270,7 @@ void sdl_osd_interface::osd_exit()
 
 	if (!SDLMAME_INIT_IN_WORKER_THREAD)
 	{
-		/* FixMe: Bug in SDL2.0, Quitting joystick will cause SIGSEGV */
-		SDL_QuitSubSystem(SDL_INIT_TIMER| SDL_INIT_VIDEO /*| SDL_INIT_JOYSTICK */);
+		SDL_QuitSubSystem(SDL_INIT_TIMER| SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER );
 	}
 }
 
@@ -490,9 +489,9 @@ void sdl_osd_interface::init(running_machine &machine)
 	{
 #ifdef SDLMAME_EMSCRIPTEN
 		// timer brings in threads which are not supported in Emscripten
-		if (SDL_InitSubSystem(SDL_INIT_VIDEO| SDL_INIT_JOYSTICK|SDL_INIT_NOPARACHUTE)) {
+		if (SDL_InitSubSystem(SDL_INIT_VIDEO| SDL_INIT_GAMECONTROLLER|SDL_INIT_NOPARACHUTE)) {
 #else
-		if (SDL_InitSubSystem(SDL_INIT_TIMER| SDL_INIT_VIDEO| SDL_INIT_JOYSTICK|SDL_INIT_NOPARACHUTE)) {
+		if (SDL_InitSubSystem(SDL_INIT_TIMER| SDL_INIT_VIDEO| SDL_INIT_GAMECONTROLLER|SDL_INIT_NOPARACHUTE)) {
 #endif
 			osd_printf_error("Could not initialize SDL %s\n", SDL_GetError());
 			exit(-1);
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 2a0147afea5..483ad426186 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -184,7 +184,7 @@ static OSDWORK_CALLBACK(sdlwindow_thread_id)
 
 	if (SDLMAME_INIT_IN_WORKER_THREAD)
 	{
-		if (SDL_InitSubSystem(SDL_INIT_TIMER|SDL_INIT_AUDIO| SDL_INIT_VIDEO| SDL_INIT_JOYSTICK|SDL_INIT_NOPARACHUTE))
+		if (SDL_InitSubSystem(SDL_INIT_TIMER|SDL_INIT_AUDIO| SDL_INIT_VIDEO| SDL_INIT_GAMECONTROLLER|SDL_INIT_NOPARACHUTE))
 		{
 			osd_printf_error("Could not initialize SDL: %s.\n", SDL_GetError());
 			exit(-1);