diff --git a/core/linux-dist/evdev.cpp b/core/linux-dist/evdev.cpp
index 3af0cdca0..223ef90a4 100644
--- a/core/linux-dist/evdev.cpp
+++ b/core/linux-dist/evdev.cpp
@@ -159,7 +159,7 @@
 		mf.parse(fd);
 
 		EvdevControllerMapping mapping = {
-			mf.get("emulator", "mapping_name", "<Unknown>").c_str(),
+			mf.get("emulator", "mapping_name", "<Unknown>"),
 			load_keycode(&mf, "dreamcast", "btn_a"),
 			load_keycode(&mf, "dreamcast", "btn_b"),
 			load_keycode(&mf, "dreamcast", "btn_c"),
@@ -308,7 +308,7 @@
 					}
 				}
 				controller->mapping = &loaded_mappings.find(string(mapping_fname))->second;
-				printf("evdev: Using '%s' mapping\n", controller->mapping->name);
+				printf("evdev: Using '%s' mapping\n", controller->mapping->name.c_str());
 				controller->init();
 
 				return 0;
diff --git a/core/linux-dist/evdev.h b/core/linux-dist/evdev.h
index 52ebad7d0..d149288de 100644
--- a/core/linux-dist/evdev.h
+++ b/core/linux-dist/evdev.h
@@ -4,7 +4,7 @@
 
 struct EvdevControllerMapping
 {
-	const char* name;
+	const std::string name;
 	const int Btn_A;
 	const int Btn_B;
 	const int Btn_C;