diff --git a/Makefile.ctr b/Makefile.ctr
index 89341484ba..1a89ed25fc 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -19,6 +19,7 @@ APP_AUDIO            = ctr/silent.wav
 APP_RSF              = ctr/tools/template.rsf
 APP_SYSTEM_MODE      = 64MB
 APP_SYSTEM_MODE_EXT  = 124MB
+APP_BIG_TEXT_SECTION = 0
 
 include ctr/Makefile.cores
 
@@ -371,13 +372,18 @@ endif
 
 %.vsh:
 
-%.smdh: $(APP_ICON)
+$(TARGET).smdh: $(APP_ICON)
 	smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
 
-%.3dsx: %.elf
+$(TARGET).3dsx: $(TARGET).elf
+ifeq ($(APP_BIG_TEXT_SECTION), 1)
+	cp ctr/big_text_section.xml $(TARGET).xml
+else
+	rm -f $(TARGET).xml
+endif
 	-3dsxtool $< $@ $(_3DSXFLAGS)
 
-%.elf: ctr/3dsx_custom_crt0.o
+$(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJS) $(LIBDIRS) $(LIBS) -o $@
 	$(NM) -CSn $@ > $(notdir $*.lst)
 
diff --git a/ctr/Makefile.cores b/ctr/Makefile.cores
index 8f973d3e14..f6711a89d3 100644
--- a/ctr/Makefile.cores
+++ b/ctr/Makefile.cores
@@ -226,19 +226,32 @@ else ifeq ($(LIBRETRO), fb_alpha)
 	APP_TITLE           = Final Burn Alpha
 	#APP_DESCRIPTION     = Retroarch 3DS
 	APP_AUTHOR          = Team FB Alpha
-	APP_PRODUCT_CODE    = RARCH-FBAF
+	APP_PRODUCT_CODE    = RARCH-FBA
 	APP_UNIQUE_ID       = 0xBAC17
 	#APP_ICON            = ctr/default.png
 	#APP_BANNER          = ctr/libretro_banner.png
 	#APP_AUDIO           = ctr/silent.wav
+   APP_BIG_TEXT_SECTION = 1
 	
 else ifeq ($(LIBRETRO), mame2003)
-	APP_TITLE           = MAME
+	APP_TITLE           = MAME-2003
 	#APP_DESCRIPTION     = Retroarch 3DS
 	#APP_AUTHOR          = Team Libretro
-	APP_PRODUCT_CODE    = RARCH-MAME
+	APP_PRODUCT_CODE    = RARCH-MAME2003
 	APP_UNIQUE_ID       = 0xBAC18
 	APP_ICON            = ctr/mame.png
 	#APP_BANNER          = ctr/libretro_banner.png
 	#APP_AUDIO           = ctr/silent.wav
+   APP_BIG_TEXT_SECTION = 1
+
+else ifeq ($(LIBRETRO), mame2000)
+	APP_TITLE           = MAME-2000
+	#APP_DESCRIPTION     = Retroarch 3DS
+	#APP_AUTHOR          = Team Libretro
+	APP_PRODUCT_CODE    = RARCH-MAME2000
+	APP_UNIQUE_ID       = 0xBAC19
+	APP_ICON            = ctr/mame.png
+	#APP_BANNER          = ctr/libretro_banner.png
+	#APP_AUDIO           = ctr/silent.wav
+   APP_BIG_TEXT_SECTION = 1
 endif
diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
index 4c7b24a957..e6326bc62f 100755
--- a/dist-scripts/dist-cores.sh
+++ b/dist-scripts/dist-cores.sh
@@ -175,6 +175,7 @@ for f in *_${platform}.${EXT} ; do
       mkdir -p ../pkg/3ds/3ds/${name}_libretro
       mv -f ../retroarch_3ds.3dsx ../pkg/3ds/3ds/${name}_libretro/${name}_libretro.3dsx
       mv -f ../retroarch_3ds.smdh ../pkg/3ds/3ds/${name}_libretro/${name}_libretro.smdh
+      mv -f ../retroarch_3ds.xml  ../pkg/3ds/3ds/${name}_libretro/${name}_libretro.xml
    elif [ $PLATFORM = "ngc" ] ; then
       mv -f ../retroarch_${platform}.dol ../pkg/${platform}/${name}_libretro_${platform}.dol
    elif [ $PLATFORM = "wii" ] ; then