diff --git a/Config.in b/Config.in
index b135ef7526049f6585e443f3315f938bee21d0c3..38702e446b3bcf9f5b226f501cc584a479433183 100644
--- a/Config.in
+++ b/Config.in
@@ -33,6 +33,7 @@ menu "Recalbox"
          source "$BR2_EXTERNAL_RECALBOX_PATH/package/recalbox-initramfs/Config.in"
          source "$BR2_EXTERNAL_RECALBOX_PATH/package/recalbox-manager2/Config.in"
          source "$BR2_EXTERNAL_RECALBOX_PATH/package/recalbox-mplayer/Config.in"
+         source "$BR2_EXTERNAL_RECALBOX_PATH/package/recalbox-piboy/Config.in"
          source "$BR2_EXTERNAL_RECALBOX_PATH/package/recalbox-romfs2/Config.in"
          source "$BR2_EXTERNAL_RECALBOX_PATH/package/recalbox-system/Config.in"
          source "$BR2_EXTERNAL_RECALBOX_PATH/package/recalbox-tft-assets/Config.in"
diff --git a/package/recalbox-piboy/Config.in b/package/recalbox-piboy/Config.in
new file mode 100644
index 0000000000000000000000000000000000000000..65a8d5b205698f2b159affd6db3f51f9d225745d
--- /dev/null
+++ b/package/recalbox-piboy/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_RECALBOX_PIBOY
+	bool "recalbox-piboy"
+	help
+	  PiBoy DMG tester
diff --git a/package/recalbox-piboy/recalbox-piboy.mk b/package/recalbox-piboy/recalbox-piboy.mk
new file mode 100644
index 0000000000000000000000000000000000000000..6587137d49e107067a74315a2c525f4d69e46b8a
--- /dev/null
+++ b/package/recalbox-piboy/recalbox-piboy.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# RECALBOX_PIBOY
+#
+################################################################################
+
+RECALBOX_PIBOY_VERSION = 0bcad43e36b5e6bc8a0963fc3ef8d842d20b18f5
+RECALBOX_PIBOY_SITE = https://gitlab.com/recalbox/recalbox-piboy.git
+RECALBOX_PIBOY_SITE_METHOD = git
+RECALBOX_PIBOY_LICENSE = GPL-3.0
+RECALBOX_PIBOY_LICENSE_FILES = LICENSE
+
+ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RPI3),y)
+define RECALBOX_PIBOY_BUILD_CMDS
+	$(CC) $(@D)/piboy-tester.c -D RPI3 -o $(@D)/piboy-tester
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RPI4),y)
+define RECALBOX_PIBOY_BUILD_CMDS
+	$(CC) $(@D)/piboy-tester.c -D RPI4 -o $(@D)/piboy-tester
+endef
+endif
+
+define RECALBOX_PIBOY_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 $(@D)/piboy-tester $(TARGET_DIR)/usr/bin/piboy-tester
+endef
+
+$(eval $(generic-package))