diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD
index 0c1f45cd7..ff5887050 100644
--- a/extra-repos/systemd/systemd-services/APKBUILD
+++ b/extra-repos/systemd/systemd-services/APKBUILD
@@ -54,6 +54,7 @@ subpackages="
 	tailscale-systemd:_service
 	tqftpserv-systemd:_service
 	udisks2-systemd:_service
+	udiskie-systemd:_service
 	waydroid-sensors-systemd:_service
 	waydroid-systemd:_service
 	wpa_supplicant-systemd:_service
@@ -124,6 +125,7 @@ _sleep_inhibitor_sources="system/sleep-inhibitor.service"
 _tailscale_sources="system/tailscaled.service etc/default/tailscaled"
 _tqftpserv_sources="system/tqftpserv.service"
 _udisks2_sources="system/udisks2.service" # From https://github.com/storaged-project/udisks/blob/master/data/udisks2.service.in
+_udiskie_sources="user/udiskie.service"  # created, no unit file upstream
 _waydroid_sources="system/waydroid-container.service"
 _waydroid_sensors_sources="system/waydroid-sensors.service"
 _wpa_supplicant_sources="system/wpa_supplicant.service"
@@ -183,6 +185,7 @@ source="$(flatpath \
 	$_tailscale_sources \
 	$_tqftpserv_sources \
 	$_udisks2_sources \
+	$_udiskie_sources \
 	$_waydroid_sensors_sources \
 	$_waydroid_sources \
 	$_wpa_supplicant_sources \
@@ -218,6 +221,7 @@ _sensorfw_system_presets="sensorfwd.service"
 _sleep_inhibitor_system_presets="sleep-inhibitor.service"
 _tqftpserv_system_presets="tqftpserv.service"
 _udisks2_system_presets="udisks2.service"
+_udiskie_user_presets="udiskie.service"
 _waydroid_system_presets="waydroid-container.service"
 _waydroid_sensors_system_presets="waydroid-sensors.service"
 _wireplumber_user_presets="wireplumber.service"
@@ -322,6 +326,7 @@ be9df5e3fd9c88ec1a8db4aa2d9e8075d74ee3d2670aa3cfc611df3cff4d4041ac888a0338c9d5f1
 324935213f1600e345acdfa70eae29181e9ee02e3aca6a03776ea4856137f72b5791e23aea46210cc756065cadd88fd1b8eb4b26a608fec94f662d683fcb9320  etc-default-tailscaled
 c569b27925297672c479e12a6425abdf5791886fff77c2c2b67b7aa9277eb0a22e7b95b52dbc225870c97460d0988a4dae18ed864e19096c704c0895de55b699  system-tqftpserv.service
 c7ea2b18c9d8f82306fbaca6d07b7019de3819d7898c3f50c3d0aceef4da4d311ed3bf31385e2f8998b8e3e326b1eb13309ffd44cf1b2d9db9b40bca00222c16  system-udisks2.service
+4c43a308e9e653914e534d92fc8caaf8c60cd21ae57bdbbf2fa591c1bd6a41e502268b6e0ff17b19cbe301fc7cfa1ad43070f13b372376fa3ddee9d11bf76f5a  user-udiskie.service
 841caa793d256cacea7eb651f3d77039b1c0ddb22727100d6cca74230e528aee09e945e1fdf20eaf40abbe3eaec9210eb7fa27144dc906cab65f8078b36921f9  system-waydroid-sensors.service
 023fc89481f9079ac2d2d6b8a9ab212cb13a6b309caaa92b336df4c6ee9cff05538f035f8411fd8f6b87ca73b400172f56022edbf02d3776ab6f2aa7af2eebef  system-waydroid-container.service
 d55edea6983ad73b1817dfac3e6d418113c8e0fbd6cb2835dedcad2e5c76c8889c09348a184ed4ab38397d7d539831ef6a7ce08037e12c7ab6dc274519dc5812  system-wpa_supplicant.service
diff --git a/extra-repos/systemd/systemd-services/user-udiskie.service b/extra-repos/systemd/systemd-services/user-udiskie.service
new file mode 100644
index 000000000..d4287b6d0
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/user-udiskie.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Automounter for removable media
+
+[Service]
+ExecStart=/usr/bin/udiskie
+Type=simple
+
+[Install]
+WantedBy=graphical-session.target