diff --git a/.gitignore b/.gitignore
index ff3897c78a6556c6a4434cd5c6cc859502e5d4a6..5e89f102ad60bf21243de80d71e5722bc9a0fbda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ po/messages.mo
 po/missing
 po/notexist
 po/phosh-tour.pot
+subprojects/gmobile/
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index fe9e9c5375c5842bd0a7b354a03bee247f7930af..0000000000000000000000000000000000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "subprojects/gmobile"]
-	path = subprojects/gmobile
-	url = https://gitlab.gnome.org/World/Phosh/gmobile.git
diff --git a/build-aux/flatpak/mobi.phosh.PhoshTour.json b/build-aux/flatpak/mobi.phosh.PhoshTour.json
index dcb07af5b35044a5b4bef423e6fcd19a25718282..efa2726f37e093e55c35438d7ecc67971f183523 100644
--- a/build-aux/flatpak/mobi.phosh.PhoshTour.json
+++ b/build-aux/flatpak/mobi.phosh.PhoshTour.json
@@ -21,14 +21,25 @@
     ],
     "modules" : [
         {
-            "name" : "phosh-tour",
+            "name" : "gmobile",
             "builddir" : true,
             "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : ".",
-		    "branch" : "main"
+                    "url"  : "https://gitlab.gnome.org/World/Phosh/gmobile.git",
+		    "tag"  : "v0.1.0"
+                }
+            ]
+        },
+        {
+            "name" : "phosh-tour",
+            "builddir" : true,
+            "buildsystem" : "meson",
+            "sources" : [
+                {
+                    "type" : "dir",
+                    "path" : "../.."
                 }
             ]
         }
diff --git a/meson.build b/meson.build
index 1b3cd35368db18d4c01645df31b3a41528266556..d003bb2f009cca4e65e81772155582f53ff797af 100644
--- a/meson.build
+++ b/meson.build
@@ -28,13 +28,13 @@ glib_dep = dependency('glib-2.0', version: glib_ver_cmp)
 gio_dep = dependency('gio-2.0', version: glib_ver_cmp)
 gtk_dep = dependency('gtk4', version: gtk_ver_cmp)
 adwaita_dep = dependency('libadwaita-1', version: adw_ver_cmp)
-gmobile = subproject('gmobile',
-                     default_options: [
-                       'examples=false',
+gmobile_dep = dependency('gmobile',
+  version: '>= 0.1.0',
+  fallback: ['gmobile', 'gmobile_dep'],
+  default_options: [ 'examples=false',
                        'gtk_doc=false',
                        'tests=false',
-                     ])
-gmobile_dep = gmobile.get_variable('gmobile_dep')
+  ])
 
 i18n = import('i18n')
 
diff --git a/subprojects/gmobile b/subprojects/gmobile
deleted file mode 160000
index 4e7ca463f5825884355ef76cbf780e0c9e415a23..0000000000000000000000000000000000000000
--- a/subprojects/gmobile
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4e7ca463f5825884355ef76cbf780e0c9e415a23
diff --git a/subprojects/gmobile.wrap b/subprojects/gmobile.wrap
index 6afa35b9e781375113b69abb107bd13af3216db9..b9ec8e95937307162e4ec551aae2b4ca9276e441 100644
--- a/subprojects/gmobile.wrap
+++ b/subprojects/gmobile.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
 directory=gmobile
 url=https://gitlab.gnome.org/World/Phosh/gmobile.git
-revision=v0.0.5
+revision=v0.1.0
 depth=1