diff --git a/.gitignore b/.gitignore
index 7dbef5b809b54eeddeaec645e68ada0172129f20..b84f5d1eb06ed921504d77500c3b11b4e99e5e24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ vgdump
 \#*#
 .\#*
 /subprojects/glib
+/subprojects/gmobile
 /subprojects/libhandy
 .vscode/
 *.gcov
diff --git a/.gitmodules b/.gitmodules
index b1bc4289a0c52750b23ed1b6ff3d773e9da1b0db..23ae380085b5753cf60c036120188be8807d41fb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "subprojects/libcall-ui"]
 	path = subprojects/libcall-ui
 	url = https://gitlab.gnome.org/World/Phosh/libcall-ui.git
-[submodule "subprojects/gmobile"]
-	path = subprojects/gmobile
-	url = https://gitlab.gnome.org/World/Phosh/gmobile.git
diff --git a/debian/not-installed b/debian/not-installed
index 1471c1a8a24b9186bd8a23193b61a3a4390b7f5d..86eff877baa99f206eaccff8dc5165c979243f5c 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,4 @@
+usr/include/gmobile/
 usr/lib/*/libgmobile.a
 usr/lib/*/libgmobile.so*
 usr/lib/*/pkgconfig/gmobile.pc
diff --git a/debian/rules b/debian/rules
index 6439a08c56b66cb101460dab963c75a446784480..5072dd797052d7362fcaf3ab4047660336e9205e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-CONFIGURE_OPTS=-Dphoc_tests=disabled -Dsystemd=true
+CONFIGURE_OPTS=--wrap-mode=default -Dphoc_tests=disabled -Dsystemd=true
 
 ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
   CONFIGURE_OPTS+=-Dgtk_doc=true -Dman=true
diff --git a/meson.build b/meson.build
index c4d2a4cd065eebf7540440ef49d486ed2c7e1e6e..e30f4475440a2c1ee72ceb0d3f6c1a24ebae01ef 100644
--- a/meson.build
+++ b/meson.build
@@ -119,14 +119,30 @@ fribidi_dep = dependency('fribidi')
 gcr_dep = dependency('gcr-3', version: '>= 3.7.5')
 glib_dep = dependency('glib-2.0', version: glib_ver_cmp)
 gio_dep = dependency('gio-2.0', version: glib_ver_cmp)
-gobject_dep = dependency('gobject-2.0', version: glib_ver_cmp)
 gio_unix_dep =  dependency('gio-unix-2.0', version: glib_ver_cmp)
+gmobile_dep = dependency('gmobile',
+  version: '>= 0.1.0',
+  fallback: ['gmobile', 'gmobile_dep'],
+  default_options:
+    [ 'examples=false',
+      'introspection=false',
+      'gtk_doc=false',
+      'tests=false'
+    ])
 gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_ver_cmp)
 gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>=3.26')
+gobject_dep = dependency('gobject-2.0', version: glib_ver_cmp)
 gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version: '>=42')
 gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
 gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>=3.22')
 gudev_dep = dependency('gudev-1.0')
+libcall_ui = subproject('libcall-ui',
+  default_options: [
+    'examples=false',
+    'gtk_doc=false',
+    'tests=false',
+    'install-i18n=@0@'.format(get_option('callui-i18n')),
+  ])
 libfeedback_dep = dependency('libfeedback-0.0',
   version: '>= 0.2.0',
   fallback: ['libfeedback', 'libfeedback_dep'],
@@ -148,21 +164,7 @@ libhandy_dep = dependency('libhandy-1',
   fallback: ['libhandy', 'libhandy_dep'],
   default_options: ['introspection=disabled']
   )
-libcall_ui = subproject('libcall-ui',
-  default_options: [
-    'examples=false',
-    'gtk_doc=false',
-    'tests=false',
-    'install-i18n=@0@'.format(get_option('callui-i18n')),
-  ])
 libcall_ui_dep = libcall_ui.get_variable('libcall_ui_dep')
-gmobile = subproject('gmobile',
-  default_options: [
-    'examples=false',
-    'gtk_doc=false',
-    'tests=false',
-  ])
-gmobile_dep = gmobile.get_variable('gmobile_dep')
 libnm_dep = dependency('libnm', version: '>= 1.14')
 libpolkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.105')
 libsoup_dep = dependency('libsoup-3.0', version: '>= 3.0')
diff --git a/plugins/upcoming-events/upcoming-events.c b/plugins/upcoming-events/upcoming-events.c
index 90b0029016580d7dcf3aa65c2b911e4551669a05..034abde2ab5fe5215e1544ec811c13ebca8e917c 100644
--- a/plugins/upcoming-events/upcoming-events.c
+++ b/plugins/upcoming-events/upcoming-events.c
@@ -249,14 +249,14 @@ on_client_disappeared (PhoshUpcomingEvents *self, const char *client_id)
 }
 
 
-static gboolean
-on_today_changed (PhoshUpcomingEvents *self)
+static void
+on_today_changed (gpointer data)
 {
+  PhoshUpcomingEvents *self = PHOSH_UPCOMING_EVENTS (data);
+
   g_debug ("Date change, reloading events");
 
   update_calendar (self, FALSE);
-
-  return G_SOURCE_REMOVE;
 }
 
 
@@ -297,7 +297,7 @@ setup_date_change_timeout (PhoshUpcomingEvents *self)
 
   g_debug ("Arming day change timer for %d seconds", seconds);
   self->today_changed_timeout_id = gm_timeout_add_seconds_once (seconds,
-                                                                (GSourceFunc) on_today_changed,
+                                                                on_today_changed,
                                                                 self);
 }
 
diff --git a/src/meson.build b/src/meson.build
index 5e3b606f1abaada41da0fff88e464274d4cb7b01..652b90f304102ff9b5245b19043f84fae1c4bea4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -318,7 +318,7 @@ libphosh_sources = files(
 # See https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/394
 custom_libsoup_dep = declare_dependency (
   include_directories: libsoup_dep.get_variable(pkgconfig: 'includedir') / 'libsoup-3.0',
-  dependencies: cc.find_library('libsoup-3.0', required: true),
+  dependencies: cc.find_library('soup-3.0', required: true),
 )
 
 phosh_deps = [
diff --git a/subprojects/gmobile b/subprojects/gmobile
deleted file mode 160000
index 760d73bb76ef450d375764cd33ca4e100f1a7c76..0000000000000000000000000000000000000000
--- a/subprojects/gmobile
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 760d73bb76ef450d375764cd33ca4e100f1a7c76
diff --git a/subprojects/gmobile.wrap b/subprojects/gmobile.wrap
new file mode 100644
index 0000000000000000000000000000000000000000..b9ec8e95937307162e4ec551aae2b4ca9276e441
--- /dev/null
+++ b/subprojects/gmobile.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=gmobile
+url=https://gitlab.gnome.org/World/Phosh/gmobile.git
+revision=v0.1.0
+depth=1