diff --git a/gui-wm/phosh/files/phosh.service b/gui-wm/phosh/files/phosh.service
index 698cdf0..6a1bda3 100644
--- a/gui-wm/phosh/files/phosh.service
+++ b/gui-wm/phosh/files/phosh.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Phosh, a shell for mobile phones
-Documentation=https://source.puri.sm/Librem5/phosh
+Documentation=https://gitlab.gnome.org/World/Phosh/phosh
 
 # Make sure we are started after logins are permitted.
 After=systemd-user-sessions.service
@@ -25,12 +25,16 @@ Before=graphical.target
 ConditionPathExists=/dev/tty0
 
 [Service]
+Environment=LANG=C.UTF-8
+Environment=XDG_CURRENT_DESKTOP=GNOME:Phosh
+Environment=XDG_SESSION_DESKTOP=phosh
+Environment=XDG_SESSION_TYPE=wayland
 ExecStart=/usr/bin/phosh
 TimeoutStartSec=30
 User=1000
 PAMName=login
 WorkingDirectory=~
-Restart=on-failure
+Restart=always
 RestartSec=5s
 
 # A virtual terminal is needed.
diff --git a/gui-wm/phosh/phosh-0.13.0.ebuild b/gui-wm/phosh/phosh-0.13.0.ebuild
index 12171dd..b78fabb 100644
--- a/gui-wm/phosh/phosh-0.13.0.ebuild
+++ b/gui-wm/phosh/phosh-0.13.0.ebuild
@@ -29,6 +29,7 @@ DEPEND="
 	media-sound/pulseaudio
 	>=gui-libs/libhandy-1.1.90
 	net-misc/networkmanager
+	gnome-base/gnome-control-center
 	gnome-base/gnome-desktop
 	gnome-base/gnome-session
 	x11-themes/gnome-backgrounds
@@ -37,6 +38,7 @@ DEPEND="
 	x11-wm/phoc
 	systemd? ( sys-apps/systemd )
 	sys-power/upower
+	app-misc/geoclue
 "
 RDEPEND="${DEPEND}"
 BDEPEND="