diff --git a/configs/garlicos_aarch64_defconfig b/configs/garlicos_aarch64_defconfig
index 6d60f03947..09098cede1 100644
--- a/configs/garlicos_aarch64_defconfig
+++ b/configs/garlicos_aarch64_defconfig
@@ -522,6 +522,7 @@ BR2_PACKAGE_HANDY=y
BR2_PACKAGE_HATARI=y
BR2_PACKAGE_MAME2000=y
BR2_PACKAGE_MAME2003_XTREME=y
+BR2_PACKAGE_MELONDS=y
BR2_PACKAGE_MGBA=y
BR2_PACKAGE_NEKOP2=y
BR2_PACKAGE_NEOCD=y
diff --git a/configs/garlicos_armhf_defconfig b/configs/garlicos_armhf_defconfig
index 590ff00e75..bc55439376 100644
--- a/configs/garlicos_armhf_defconfig
+++ b/configs/garlicos_armhf_defconfig
@@ -554,6 +554,7 @@ BR2_PACKAGE_HANDY=y
BR2_PACKAGE_HATARI=y
BR2_PACKAGE_MAME2000=y
BR2_PACKAGE_MAME2003_XTREME=y
+BR2_PACKAGE_MELONDS=y
BR2_PACKAGE_MGBA=y
BR2_PACKAGE_NEKOP2=y
BR2_PACKAGE_NEOCD=y
diff --git a/configs/garlicos_mipsel_defconfig b/configs/garlicos_mipsel_defconfig
index 95f7758faa..99e7eaea84 100644
--- a/configs/garlicos_mipsel_defconfig
+++ b/configs/garlicos_mipsel_defconfig
@@ -470,6 +470,7 @@ BR2_PACKAGE_HANDY=y
BR2_PACKAGE_HATARI=y
BR2_PACKAGE_MAME2000=y
BR2_PACKAGE_MAME2003_XTREME=y
+BR2_PACKAGE_MELONDS=y
BR2_PACKAGE_MGBA=y
BR2_PACKAGE_NEKOP2=y
BR2_PACKAGE_NEOCD=y
diff --git a/package/Config.in b/package/Config.in
index d586d9de38..4ef7cf6331 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -48,6 +48,7 @@ menu "Emulators"
source "package/hatari/Config.in"
source "package/mame2000/Config.in"
source "package/mame2003-xtreme/Config.in"
+ source "package/melonds/Config.in"
source "package/mgba/Config.in"
source "package/nekop2/Config.in"
source "package/neocd/Config.in"
diff --git a/package/garlicui/src/Makefile b/package/garlicui/src/Makefile
index aaf5e5de7e..35199cf834 100644
--- a/package/garlicui/src/Makefile
+++ b/package/garlicui/src/Makefile
@@ -12,7 +12,7 @@ $(TARGET): $(wildcard *.c)
translations: $(MO_FILES)
%.mo: %.po
- msgfmt -o $@ $<
+ $(HOST_DIR)/bin/msgfmt -o $@ $<
clean:
-rm -rf $(TARGET) $(MO_FILES) *.o
diff --git a/package/garlicui/src/library/Nintendo DS/config.xml b/package/garlicui/src/library/Nintendo DS/config.xml
new file mode 100644
index 0000000000..8fd2efa609
--- /dev/null
+++ b/package/garlicui/src/library/Nintendo DS/config.xml
@@ -0,0 +1,8 @@
+
+ melonds
+
+ .nds
+ .ids
+ .dsi
+
+
diff --git a/package/garlicui/src/library/Nintendo DS/icon.svg b/package/garlicui/src/library/Nintendo DS/icon.svg
new file mode 100644
index 0000000000..ac0d93bfa2
--- /dev/null
+++ b/package/garlicui/src/library/Nintendo DS/icon.svg
@@ -0,0 +1,319 @@
+
+
+
+
diff --git a/package/melonds/Config.in b/package/melonds/Config.in
new file mode 100644
index 0000000000..5913ec2b2c
--- /dev/null
+++ b/package/melonds/Config.in
@@ -0,0 +1,5 @@
+menuconfig BR2_PACKAGE_MELONDS
+ bool "melonds"
+ depends on BR2_PACKAGE_RETROARCH
+ help
+ libretro implementation of melonds
diff --git a/package/melonds/melonds.mk b/package/melonds/melonds.mk
new file mode 100644
index 0000000000..2d861d6839
--- /dev/null
+++ b/package/melonds/melonds.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# melonds
+#
+################################################################################
+
+MELONDS_VERSION = c6488c88cb4c7583dbcd61609e0eef441572fae8
+MELONDS_SITE = https://github.com/libretro/melonds.git
+MELONDS_SITE_METHOD = git
+MELONDS_LICENSE = Non-commercial
+MELONDS_LICENSE_FILES = LICENSE.txt
+MELONDS_MAKE_OPTS += \
+ CROSS_COMPILE=$(TARGET_CROSS) \
+ CC=$(TARGET_CROSS)gcc \
+ CXX=$(TARGET_CROSS)g++ \
+ ARCH=$(BR2_NORMALIZED_ARCH)
+
+define MELONDS_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) -C $(@D) $(MELONDS_MAKE_OPTS)
+endef
+
+define MELONDS_INSTALL_TARGET_CMDS
+ mkdir -p $(TARGET_DIR)/root/.config/retroarch/cores
+ wget -O $(TARGET_DIR)/root/.config/retroarch/cores/melonds_libretro.info https://raw.githubusercontent.com/libretro/libretro-super/master/dist/info/melonds_libretro.info
+ $(INSTALL) -m 0755 -D $(@D)/melonds_libretro.so $(TARGET_DIR)/root/.config/retroarch/cores/
+endef
+
+$(eval $(generic-package))