diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
index 7deea1c..3401c10 100644
--- a/libretro/jni/Android.mk
+++ b/libretro/jni/Android.mk
@@ -27,13 +27,6 @@ CORE_DIR := ../..
 
 include ../Makefile.common
 
-$(CORE_DIR)/libretro/%_boot.c: $(CORE_DIR)/BootROMs/prebuilt/%_boot.bin
-		echo "/* AUTO-GENERATED */" > $@
-		echo "const unsigned char $(notdir $(@:%.c=%))[] = {" >> $@
-		hexdump -v -e '/1 "0x%02x, "' $< >> $@
-		echo "};" >> $@
-		echo "const unsigned $(notdir $(@:%.c=%))_length = sizeof($(notdir $(@:%.c=%)));" >> $@
-
 LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C)
 LOCAL_CFLAGS += -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DNDEBUG -D_USE_MATH_DEFINES  -DGB_INTERNAL -std=c99 -I$(CORE_DIR) -DSAMEBOY_CORE_VERSION=\"$(VERSION)\"
 
diff --git a/libretro/libretro.c b/libretro/libretro.c
index 6f05cf8..dfddc6a 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -238,12 +238,12 @@ static const struct retro_variable vars_link_dual[] = {
 };
 
 static const struct retro_subsystem_memory_info gb1_memory[] = {
-    { "srm.slot1", RETRO_MEMORY_GAMEBOY_1_SRAM },
+    { "srm", RETRO_MEMORY_GAMEBOY_1_SRAM },
     { "rtc", RETRO_MEMORY_GAMEBOY_1_RTC },
 };
 
 static const struct retro_subsystem_memory_info gb2_memory[] = {
-    { "srm.slot2", RETRO_MEMORY_GAMEBOY_2_SRAM },
+    { "srm", RETRO_MEMORY_GAMEBOY_2_SRAM },
     { "rtc", RETRO_MEMORY_GAMEBOY_2_RTC },
 };