diff --git a/Makefile b/Makefile
index d5d50743..ae89ffdc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 APP = Ludo
 BUNDLENAME = $(APP)-$(OS)-$(ARCH)-$(VERSION)
 
-CORES = atari800 fbalpha gambatte genesis_plus_gx handy mednafen_ngp mednafen_pce_fast mednafen_psx mednafen_saturn mednafen_supergrafx mednafen_vb mednafen_wswan mgba nestopia pcsx_rearmed picodrive prosystem snes9x stella vecx virtualjaguar
+CORES = atari800 fbalpha fceumm gambatte genesis_plus_gx handy mednafen_ngp mednafen_pce_fast mednafen_psx mednafen_saturn mednafen_supergrafx mednafen_vb mednafen_wswan mgba pcsx_rearmed picodrive prosystem snes9x stella vecx virtualjaguar
 
 ifeq ($(OS), OSX)
 	BUILDBOTURL=http://buildbot.libretro.com/nightly/apple/osx/$(ARCH)/latest
diff --git a/settings/defaults.go b/settings/defaults.go
index 5c41f0f4..9edac52f 100644
--- a/settings/defaults.go
+++ b/settings/defaults.go
@@ -36,11 +36,11 @@ func defaultSettings() Settings {
 			"Microsoft - MSX2":                               "bluemsx_libretro",
 			"NEC - PC Engine SuperGrafx":                     "mednafen_supergrafx_libretro",
 			"NEC - PC Engine - TurboGrafx 16":                "mednafen_pce_fast_libretro",
-			"Nintendo - Family Computer Disk System":         "nestopia_libretro",
+			"Nintendo - Family Computer Disk System":         "fceumm_libretro",
 			"Nintendo - Game Boy Advance":                    "mgba_libretro",
 			"Nintendo - Game Boy Color":                      "gambatte_libretro",
 			"Nintendo - Game Boy":                            "gambatte_libretro",
-			"Nintendo - Nintendo Entertainment System":       "nestopia_libretro",
+			"Nintendo - Nintendo Entertainment System":       "fceumm_libretro",
 			"Nintendo - Super Nintendo Entertainment System": "snes9x_libretro",
 			"Nintendo - Virtual Boy":                         "mednafen_vb_libretro",
 			"Sega - 32X":                                     "picodrive_libretro",