diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 1a1c9c6fac..e2eadb2850 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -19,6 +19,13 @@ define RPI_USERLAND_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D package/rpi-userland/S94vcfiled \
 		$(TARGET_DIR)/etc/init.d/S94vcfiled
 endef
+define RPI_USERLAND_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 package/rpi-userland/vcfiled.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/vcfiled.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/vcfiled.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vcfiled.service
+endef
 endif
 
 define RPI_USERLAND_POST_TARGET_CLEANUP
diff --git a/package/rpi-userland/vcfiled.service b/package/rpi-userland/vcfiled.service
new file mode 100644
index 0000000000..2b8f1dccff
--- /dev/null
+++ b/package/rpi-userland/vcfiled.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=VideoCore file server daemon
+
+[Service]
+ExecStart=/usr/sbin/vcfiled --foreground
+
+[Install]
+WantedBy=multi-user.target