diff --git a/userspace/root/etc/init.d/tftp_server.sh b/userspace/root/etc/init.d/tftp_server.sh
deleted file mode 100755
index b3943e9..0000000
--- a/userspace/root/etc/init.d/tftp_server.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides:          Qualcomm.com
-# Required-Start:
-# Required-Stop:
-# Default-Start:
-# Default-Stop:
-# Short-Description: tftp server
-# Description:       tftp server dasmon
-### END INIT INFO
-# Copyright (c) 2014 Qualcomm Technologies, Inc.  All Rights Reserved.
-# Qualcomm Technologies Proprietary and Confidential.
-
-set -e
-
-case "$1" in
-  start)
-        echo -n "Starting tftp_server: "
-        while [ ! -e /data/persist/rfs ] ; do sleep 0.1; done
-        start-stop-daemon -S -b -x /sbin/tftp_server
-
-        echo "done"
-        ;;
-  stop)
-        echo -n "Stopping tftp_server: "
-        start-stop-daemon -K -n tftp_server
-        echo "done"
-        ;;
-  restart)
-        $0 stop
-        $0 start
-        ;;
-  *)
-        echo "Usage tftp_server { start | stop | restart}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/userspace/root/etc/rc2.d/S20tftp_server.sh b/userspace/root/etc/rc2.d/S20tftp_server.sh
deleted file mode 120000
index 4aba7f0..0000000
--- a/userspace/root/etc/rc2.d/S20tftp_server.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/tftp_server.sh
\ No newline at end of file
diff --git a/userspace/root/etc/rc3.d/S20tftp_server.sh b/userspace/root/etc/rc3.d/S20tftp_server.sh
deleted file mode 120000
index 4aba7f0..0000000
--- a/userspace/root/etc/rc3.d/S20tftp_server.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/tftp_server.sh
\ No newline at end of file
diff --git a/userspace/root/etc/rc4.d/S20tftp_server.sh b/userspace/root/etc/rc4.d/S20tftp_server.sh
deleted file mode 120000
index 4aba7f0..0000000
--- a/userspace/root/etc/rc4.d/S20tftp_server.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/tftp_server.sh
\ No newline at end of file
diff --git a/userspace/root/etc/rc5.d/S20tftp_server.sh b/userspace/root/etc/rc5.d/S20tftp_server.sh
deleted file mode 120000
index 4aba7f0..0000000
--- a/userspace/root/etc/rc5.d/S20tftp_server.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/tftp_server.sh
\ No newline at end of file
diff --git a/userspace/root/usr/lib/systemd/system/tftp_server.service b/userspace/root/usr/lib/systemd/system/tftp_server.service
new file mode 100644
index 0000000..dd8b169
--- /dev/null
+++ b/userspace/root/usr/lib/systemd/system/tftp_server.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Qualcomm TFTP server
+After=fs_setup.service
+
+[Service]
+Type=simple
+ExecStartPre=/bin/sh -c 'while [ ! -e /data/persist/rfs ]; do sleep 0.1; done'
+ExecStart=/usr/sbin/tftp_server
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/userspace/services.sh b/userspace/services.sh
index 94737e3..4f25fa3 100755
--- a/userspace/services.sh
+++ b/userspace/services.sh
@@ -22,6 +22,7 @@ systemctl enable logrotate-hourly.timer
 systemctl enable avahi-daemon
 systemctl enable avahi-ssh-publish.service
 systemctl enable screen_calibration.service
+systemctl enable tftp_server.service
 
 # Disable SSH by default
 systemctl disable ssh