diff --git a/.gitmodules b/.gitmodules
index 642b984..d4cc77b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "funkey_sdl1.2"]
 	path = funkey_sdl1.2
 	url = git@bitbucket.org:keymu2/funkey_sdl1.2.git
+[submodule "funkey-gpio-mapping"]
+	path = funkey-gpio-mapping
+	url = git@bitbucket.org:keymu2/funkey-gpio-mapping.git
diff --git a/FunKey/Config.in b/FunKey/Config.in
index 7392cc0..f6ed32b 100644
--- a/FunKey/Config.in
+++ b/FunKey/Config.in
@@ -1,3 +1,4 @@
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/mednafen/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/retrofe/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/retrofe-layout/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/funkey-gpio-mapping/Config.in"
diff --git a/FunKey/board/funkey/local.mk b/FunKey/board/funkey/local.mk
index eddb3cc..67501a1 100644
--- a/FunKey/board/funkey/local.mk
+++ b/FunKey/board/funkey/local.mk
@@ -1,3 +1,4 @@
 RETROFE_OVERRIDE_SRCDIR = ../funkey_retrofe
 RETROFE_LAYOUT_OVERRIDE_SRCDIR = ../funkey_retrofe_layout_240x240
 SDL_OVERRIDE_SRCDIR = ../funkey_sdl1.2
+FUNKEY_GPIO_MAPPING_OVERRIDE_SRCDIR = ../funkey-gpio-mapping
diff --git a/FunKey/package/funkey-gpio-mapping/Config.in b/FunKey/package/funkey-gpio-mapping/Config.in
new file mode 100644
index 0000000..9ee705d
--- /dev/null
+++ b/FunKey/package/funkey-gpio-mapping/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_FUNKEY_GPIO_MAPPING
+	bool "funkey gpio mapping"
+	help
+	  The FunKey GPIO mapping utility.
diff --git a/FunKey/package/funkey-gpio-mapping/funkey-gpio-mapping.mk b/FunKey/package/funkey-gpio-mapping/funkey-gpio-mapping.mk
new file mode 100644
index 0000000..86264a0
--- /dev/null
+++ b/FunKey/package/funkey-gpio-mapping/funkey-gpio-mapping.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# funkey-gpio-mapping
+#
+################################################################################
+#https://bitbucket.org/keymu2/funkey-gpio-mapping/get/1a98c2321961.zip
+FUNKEY_GPIO_MAPPING_VERSION = 1a98c2321961
+FUNKEY_GPIO_MAPPING_SOURCE = $(FUNKEY_GPIO_MAPPING_VERSION).zip
+FUNKEY_GPIO_MAPPING_SITE = https://bitbucket.org/keymu2/funkey-gpio-mapping/get
+FUNKEY_GPIO_MAPPING_SITE_LICENSE = GPL-2.1+
+FUNKEY_GPIO_MAPPING_SITE_LICENSE_FILES = COPYING
+
+define FUNKEY_GPIO_MAPPING_BUILD_CMDS
+	$(TARGET_MAKE_ENV) CROSS_COMPILE=$(TARGET_CROSS) \
+		CC="$(TARGET_CC)" \
+		$(MAKE) -C $(@D) \
+		CFLAGS="$(TARGET_CFLAGS)" $(FUNKEY_GPIO_MAPPING_BUILD_TARGET)
+endef
+
+define FUNKEY_GPIO_MAPPING_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/bin
+	$(INSTALL) -m 0755 $(@D)/funkey_gpio_management $(TARGET_DIR)/usr/local/bin/funkey_gpio_management
+endef
+
+$(eval $(generic-package))
diff --git a/funkey-gpio-mapping b/funkey-gpio-mapping
new file mode 160000
index 0000000..1a98c23
--- /dev/null
+++ b/funkey-gpio-mapping
@@ -0,0 +1 @@
+Subproject commit 1a98c232196152495abab56646844a304c17e486