diff --git a/debian/binary/etc/systemd/system/multi-user.target.wants/userdata-fsck.service b/debian/binary/etc/systemd/system/multi-user.target.wants/userdata-fsck.service
new file mode 120000
index 000000000..8da4fc5db
--- /dev/null
+++ b/debian/binary/etc/systemd/system/multi-user.target.wants/userdata-fsck.service
@@ -0,0 +1 @@
+/lib/systemd/system/userdata-fsck.service
\ No newline at end of file
diff --git a/debian/binary/etc/systemd/system/userdata-fsck.service b/debian/binary/etc/systemd/system/userdata-fsck.service
new file mode 120000
index 000000000..8da4fc5db
--- /dev/null
+++ b/debian/binary/etc/systemd/system/userdata-fsck.service
@@ -0,0 +1 @@
+/lib/systemd/system/userdata-fsck.service
\ No newline at end of file
diff --git a/debian/binary/usr/lib/systemd/system/userdata-fsck.service b/debian/binary/usr/lib/systemd/system/userdata-fsck.service
new file mode 100644
index 000000000..9440b38b2
--- /dev/null
+++ b/debian/binary/usr/lib/systemd/system/userdata-fsck.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Force fsck on userdata partition
+DefaultDependencies=no
+Before=local-fs-pre.target
+After=systemd-fsck-root.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=-/sbin/e2fsck -fy /dev/mmcblk2p9
+TimeoutSec=0
+
+[Install]
+WantedBy=local-fs-pre.target