diff --git a/FunKey/Config.in b/FunKey/Config.in
index f6ed32b..4f44e21 100644
--- a/FunKey/Config.in
+++ b/FunKey/Config.in
@@ -1,4 +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"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/FunKey-GPIO-Mapping/Config.in"
diff --git a/FunKey/package/funkey-gpio-mapping/Config.in b/FunKey/package/FunKey-GPIO-Mapping/Config.in
similarity index 74%
rename from FunKey/package/funkey-gpio-mapping/Config.in
rename to FunKey/package/FunKey-GPIO-Mapping/Config.in
index 9ee705d..bdbcc62 100644
--- a/FunKey/package/funkey-gpio-mapping/Config.in
+++ b/FunKey/package/FunKey-GPIO-Mapping/Config.in
@@ -1,4 +1,4 @@
 config BR2_PACKAGE_FUNKEY_GPIO_MAPPING
-	bool "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
similarity index 54%
rename from FunKey/package/funkey-gpio-mapping/funkey-gpio-mapping.mk
rename to FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk
index 86264a0..bc29a68 100644
--- a/FunKey/package/funkey-gpio-mapping/funkey-gpio-mapping.mk
+++ b/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk
@@ -1,12 +1,13 @@
 ################################################################################
 #
-# funkey-gpio-mapping
+# 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_VERSION = 82276e6ebec09c15009d481a9be55541ba3c30f1
+FUNKEY_GPIO_MAPPING_SITE_METHOD = git
+#FUNKEY_GPIO_MAPPING_SITE = ssh://git@github.com/FunKey-Project/FunKey-GPIO-Mapping.git
+FUNKEY_GPIO_MAPPING_SITE = ssh://git@fk/FunKey-Project/FunKey-GPIO-Mapping.git
 FUNKEY_GPIO_MAPPING_SITE_LICENSE = GPL-2.1+
 FUNKEY_GPIO_MAPPING_SITE_LICENSE_FILES = COPYING
 
@@ -18,8 +19,10 @@ define FUNKEY_GPIO_MAPPING_BUILD_CMDS
 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
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/sbin
+	$(INSTALL) -m 0755 $(@D)/funkey_gpio_management $(TARGET_DIR)/usr/local/sbin/funkey_gpio_manag
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc
+	$(INSTALL) -m 0644 $(@D)/funkey_gpio_mapping.conf $(TARGET_DIR)/etc/funkey_gpio_mapping.conf
 endef
 
 $(eval $(generic-package))