diff --git a/gluon/gluon-radvd/files/etc/init.d/gluon-radvd b/gluon/gluon-radvd/files/etc/init.d/gluon-radvd
index 4064439..2cfe098 100755
--- a/gluon/gluon-radvd/files/etc/init.d/gluon-radvd
+++ b/gluon/gluon-radvd/files/etc/init.d/gluon-radvd
@@ -4,9 +4,13 @@ START=50
 
 SERVICE_USE_PID=1
 SERVICE_NAME=gluon-radvd
+SERVICE_PID_DIR=/var/run/gluon-radvd
+SERVICE_PID_FILE="$SERVICE_PID_DIR"/gluon-radvd.pid
 
 start() {
-	service_start /usr/sbin/radvd -C /lib/gluon/radvd/radvd.conf -m stderr_syslog -p /var/run/gluon-radvd.pid
+	mkdir -p "$SERVICE_PID_DIR"
+	chown gluon-radvd "$SERVICE_PID_DIR"
+	service_start /usr/sbin/radvd -C /lib/gluon/radvd/radvd.conf -m stderr_syslog -u gluon-radvd -p "$SERVICE_PID_FILE"
 }
 
 stop() {
diff --git a/gluon/gluon-radvd/files/lib/gluon/upgrade/radvd/invariant/10-radvd-user b/gluon/gluon-radvd/files/lib/gluon/upgrade/radvd/invariant/10-radvd-user
new file mode 100755
index 0000000..baa0c9d
--- /dev/null
+++ b/gluon/gluon-radvd/files/lib/gluon/upgrade/radvd/invariant/10-radvd-user
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. /lib/gluon/functions/users.sh
+
+add_user gluon-radvd 801