diff --git a/contrib/i2pd.service b/contrib/i2pd.service
index 381ae483..a1a54d97 100644
--- a/contrib/i2pd.service
+++ b/contrib/i2pd.service
@@ -11,7 +11,7 @@ RuntimeDirectoryMode=0700
 LogsDirectory=i2pd
 LogsDirectoryMode=0700
 Type=forking
-ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
+ExecStart=/usr/bin/i2pd --daemon --service --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log
 ExecReload=/bin/sh -c "kill -HUP $MAINPID"
 PIDFile=/run/i2pd/i2pd.pid
 ### Uncomment, if auto restart needed
diff --git a/contrib/openrc/i2pd.openrc b/contrib/openrc/i2pd.openrc
index 0233eed8..d43199ee 100644
--- a/contrib/openrc/i2pd.openrc
+++ b/contrib/openrc/i2pd.openrc
@@ -1,18 +1,19 @@
 #!/sbin/openrc-run
 
-pidfile="/var/run/i2pd/i2pd.pid"
+name="Invisible Internet Protocol daemon"
+description="i2p router written in C++"
+
+pidfile="/run/i2pd/i2pd.pid"
 logfile="/var/log/i2pd/i2pd.log"
 mainconf="/etc/i2pd/i2pd.conf"
 tunconf="/etc/i2pd/tunnels.conf"
 tundir="/etc/i2pd/tunnels.conf.d"
 
-name="i2pd"
 command="/usr/bin/i2pd"
-command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile"
-description="i2p router written in C++"
+command_args="--daemon --service --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile --log=file --logfile=$logfile "
+command_user="i2pd"
 required_dirs="/var/lib/i2pd"
-required_files="$mainconf"
-start_stop_daemon_args="--chuid i2pd"
+required_files="/etc/i2pd/i2pd.conf"
 
 depend() {
   need mountall
@@ -30,8 +31,8 @@ start_pre() {
     exit 1
   fi
 
-  checkpath -f -o i2pd:adm $logfile
-  checkpath -f -o i2pd:adm $pidfile
+  checkpath -f -o $command_user $logfile
+  checkpath -f -o $command_user $pidfile
 
   if [ -n "$DAEMON_OPTS" ]; then
     command_args="$command_args $DAEMON_OPTS"