diff --git a/FunKey/Config.in b/FunKey/Config.in
index 989b968..73b49b4 100644
--- a/FunKey/Config.in
+++ b/FunKey/Config.in
@@ -18,3 +18,4 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/fluidlite/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/libmikmod/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/commander/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/bibi/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/picoarch/Config.in"
diff --git a/FunKey/package/picoarch/Config.in b/FunKey/package/picoarch/Config.in
new file mode 100644
index 0000000..bb5ec15
--- /dev/null
+++ b/FunKey/package/picoarch/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PICOARCH
+	bool "picoarch"
+	default y
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_IMAGE
+	select BR2_PACKAGE_SDL_TTF
+	help
+	A Libretro frontend designed for small screens and low power
+
+
+	  https://git.crowdedwood.com/picoarch
diff --git a/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop b/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop
new file mode 100644
index 0000000..b5bb420
--- /dev/null
+++ b/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=PicoArch
+Comment=SDL Libretro frontend
+Exec=/usr/games/picoarch %f
+Icon=picoarch
+Categories=games
+SelectorFilter=so
diff --git a/FunKey/package/picoarch/opk/picoarch.png b/FunKey/package/picoarch/opk/picoarch.png
new file mode 100644
index 0000000..f748798
Binary files /dev/null and b/FunKey/package/picoarch/opk/picoarch.png differ
diff --git a/FunKey/package/picoarch/picoarch.mk b/FunKey/package/picoarch/picoarch.mk
new file mode 100644
index 0000000..0227fbe
--- /dev/null
+++ b/FunKey/package/picoarch/picoarch.mk
@@ -0,0 +1,50 @@
+################################################################################
+#
+# picoarch
+#
+################################################################################
+
+PICOARCH_VERSION = v1.0-funkey-s
+PICOARCH_SITE_METHOD = git
+PICOARCH_SITE = https://github.com/DrUm78/picoarch.git
+PICOARCH_LICENSE = MAME
+PICOARCH_LICENSE_FILES = LICENSE
+
+PICOARCH_DEPENDENCIES = sdl sdl_image sdl_ttf
+
+PICOARCH_SDL_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
+PICOARCH_SDL_LIBS   += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
+
+PICOARCH_CFLAGS += $(PICOARCH_SDL_CFLAGS)
+PICOARCH_CFLAGS += -DFUNKEY_S -Ofast -DNDEBUG  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+PICOARCH_CFLAGS += -Wall -fdata-sections -ffunction-sections -flto
+PICOARCH_CFLAGS += -I./ -I./libretro-common/include/
+
+PICOARCH_LIBS += $(PICOARCH_SDL_LIBS)
+PICOARCH_LIBS += -lc -ldl -lgcc -lm -lSDL -lasound -lpng -lz -Wl,--gc-sections -flto -lSDL_image -lSDL_ttf
+
+define PICOARCH_BUILD_CMDS
+	(cd $(@D); \
+	make picoarch platform=funkey-s \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	CFLAGS='$(PICOARCH_CFLAGS)' \
+	LDFLAGS='$(PICOARCH_LIBS)' \
+	SDL_INCLUDES='$(PICOARCH_SDL_CFLAGS)' \
+	SDL_LIBS='$(PICOARCH_SDL_LIBS)' \
+	)
+endef
+
+PICOARCH_GIT_SUBMODULES = YES
+
+define PICOARCH_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games
+	$(INSTALL) -m 0755 $(@D)/picoarch $(TARGET_DIR)/usr/games/
+endef
+
+define PICOARCH_CREATE_OPK
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Libretro
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk $(TARGET_DIR)/usr/local/share/OPKs/Libretro/picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+endef
+PICOARCH_POST_INSTALL_TARGET_HOOKS += PICOARCH_CREATE_OPK
+
+$(eval $(generic-package))
diff --git a/package b/package
deleted file mode 100755
index 63a0cbd..0000000
--- a/package
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-rm -rf FunKey/output/build/picoarch
-mkdir -p FunKey/output/build/picoarch
-cd FunKey/output/build/picoarch
-git clone https://github.com/DrUm78/picoarch .
-git submodule update --init
-make picoarch platform=funkey-s
-cp README.funkey-s.md opk/
-mksquashfs opk/ picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-cp picoarch ../../../board/funkey/rootfs-overlay/usr/games/
-cp picoarch_funkey-s.opk ../../../board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/
-
-cd -
-make
-
-rm -f FunKey/board/funkey/rootfs-overlay/usr/games/picoarch
-rm -f FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/picoarch_funkey-s.opk