diff --git a/dev-libs/feedbackd/feedbackd-0.0.2-r1.ebuild b/dev-libs/feedbackd/feedbackd-0.0.2-r2.ebuild
similarity index 86%
rename from dev-libs/feedbackd/feedbackd-0.0.2-r1.ebuild
rename to dev-libs/feedbackd/feedbackd-0.0.2-r2.ebuild
index e19f299..7fe51d3 100644
--- a/dev-libs/feedbackd/feedbackd-0.0.2-r1.ebuild
+++ b/dev-libs/feedbackd/feedbackd-0.0.2-r2.ebuild
@@ -58,4 +58,15 @@ src_install() {
 		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
 		mv "${ED}"/usr/share/doc/libfeedback-${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
 	fi
+
+	udev_newrules "${S}/debian/feedbackd.udev" 90-feedbackd.rules
+	systemd_newunit "${FILESDIR}"/org.sigxcpu.Feedback.service 'org.sigxcpu.Feedback.service'
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
 }
diff --git a/dev-libs/feedbackd/files/org.sigxcpu.Feedback.service b/dev-libs/feedbackd/files/org.sigxcpu.Feedback.service
new file mode 100644
index 0000000..ffa6b19
--- /dev/null
+++ b/dev-libs/feedbackd/files/org.sigxcpu.Feedback.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.sigxcpu.Feedback
+Exec=@libexecdir@/feedbackd
diff --git a/gui-wm/phosh/files/osk-wayland b/gui-wm/phosh/files/osk-wayland
new file mode 100644
index 0000000..fcc5049
--- /dev/null
+++ b/gui-wm/phosh/files/osk-wayland
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+OSK=/usr/bin/virtboard
+
+if [ -x /usr/bin/squeekboard ]; then
+  OSK=/usr/bin/squeekboard
+fi
+exec $OSK
diff --git a/gui-wm/phosh/files/phosh.service b/gui-wm/phosh/files/phosh.service
index 6a1bda3..a76231b 100755
--- a/gui-wm/phosh/files/phosh.service
+++ b/gui-wm/phosh/files/phosh.service
@@ -2,10 +2,15 @@
 Description=Phosh, a shell for mobile phones
 Documentation=https://gitlab.gnome.org/World/Phosh/phosh
 
-# Make sure we are started after logins are permitted.
-After=systemd-user-sessions.service
-# If Plymouth is used, we want to start when it is on its way out.
-After=plymouth-quit-wait.service
+# replaces the getty
+Conflicts=getty@tty1.service
+After=getty@tty1.service
+
+# Needs all the dependencies of the services it's replacing
+# (currently getty@tty1.service):
+After=rc-local.service plymouth-quit-wait.service systemd-user-sessions.service
+
+OnFailure=getty@tty1.service
 
 # D-Bus is necessary for contacting logind. Logind is required.
 Wants=dbus.socket
@@ -26,7 +31,7 @@ ConditionPathExists=/dev/tty0
 
 [Service]
 Environment=LANG=C.UTF-8
-Environment=XDG_CURRENT_DESKTOP=GNOME:Phosh
+Environment=XDG_CURRENT_DESKTOP=Phosh:GNOME
 Environment=XDG_SESSION_DESKTOP=phosh
 Environment=XDG_SESSION_TYPE=wayland
 ExecStart=/usr/bin/phosh
diff --git a/gui-wm/phosh/phosh-0.23.0.ebuild b/gui-wm/phosh/phosh-0.23.0.ebuild
index 6d7c714..3718930 100755
--- a/gui-wm/phosh/phosh-0.23.0.ebuild
+++ b/gui-wm/phosh/phosh-0.23.0.ebuild
@@ -44,6 +44,7 @@ DEPEND="
 	app-misc/geoclue
         net-libs/libnma
         media-sound/callaudiod
+        media-libs/mesa[zink]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
@@ -86,6 +87,7 @@ src_install() {
 	newpamd "${FILESDIR}"/pam_phosh 'phosh'
 	systemd_newunit "${FILESDIR}"/phosh.service 'phosh.service'
 	domenu "${FILESDIR}"/sm.puri.OSK0.desktop
+	dobin "${FILESDIR}"/osk-wayland
 
 	DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
 				page and then edit the /etc/security/passwdqc.conf file to change enforce=none