diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..d90906f0273
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/flipper-gblink"]
+	path = lib/flipper-gblink
+	url = https://github.com/kbembedded/flipper-gblink
diff --git a/application.fam b/application.fam
index 38ca10e64fe..029c4358f50 100644
--- a/application.fam
+++ b/application.fam
@@ -9,6 +9,13 @@ App(
     fap_category="GPIO",
     fap_icon="pokemon_10px.png",
     fap_icon_assets="assets",
-    fap_author="Esteban Fuentealba",
-    fap_weburl="https://github.com/EstebanFuentealba"
+    fap_author="Esteban Fuentealba, Kris Bahnsen, Darryn Cull",
+    fap_weburl="https://github.com/EstebanFuentealba",
+    fap_description="Pokemon exchange from Flipper Zero to Game Boy for Generation I (Pokemon Red, Blue, Yellow)",
+    fap_private_libs=[
+        Lib(
+            name="flipper-gblink",
+            sources=["gblink.c"],
+        ),
+    ],
 )
diff --git a/lib/flipper-gblink b/lib/flipper-gblink
new file mode 160000
index 00000000000..91c64228207
--- /dev/null
+++ b/lib/flipper-gblink
@@ -0,0 +1 @@
+Subproject commit 91c64228207b2312289c67a83e321084381ebe50