diff --git a/.gitmodules b/.gitmodules
index 0297da14d..5d10b23b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,3 +35,6 @@
 [submodule "documentation/doxygen/doxygen-awesome-css"]
 	path = documentation/doxygen/doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
+[submodule "applications/system/picopass"]
+	path = applications/system/picopass
+	url = https://gitlab.com/bettse/picopass.git
diff --git a/applications/ReadMe.md b/applications/ReadMe.md
index dd664f37b..b8cee72ac 100644
--- a/applications/ReadMe.md
+++ b/applications/ReadMe.md
@@ -80,3 +80,4 @@ Utility apps not visible in other menus, plus few external apps pre-packaged wit
 - `storage_move_to_sd`  - Data migration tool for internal storage
 - `updater`             - Update service & application
 - `mfkey`               - MIFARE Classic key recovery tool
+- `picopass`            - Picopass tool
diff --git a/applications/system/application.fam b/applications/system/application.fam
index 647800e59..79796fd56 100644
--- a/applications/system/application.fam
+++ b/applications/system/application.fam
@@ -6,6 +6,7 @@ App(
         "updater_app",
         "js_app",
         "mfkey",
+        "picopass",
         # "archive",
     ],
 )
diff --git a/applications/system/picopass b/applications/system/picopass
new file mode 160000
index 000000000..00f8a221f
--- /dev/null
+++ b/applications/system/picopass
@@ -0,0 +1 @@
+Subproject commit 00f8a221fa020ab0fcc22d77e43ae1ab6ac51c6b