diff --git a/debian/i2pd.openrc b/debian/i2pd.openrc
index ddcb4003..6253cfa6 100644
--- a/debian/i2pd.openrc
+++ b/debian/i2pd.openrc
@@ -5,11 +5,9 @@ logfile="/var/log/i2pd.log"
 mainconf="/etc/i2pd/i2pd.conf"
 tunconf="/etc/i2pd/tunnels.conf"
 
-. /etc/default/i2pd
-
 name="i2pd"
 command="/usr/sbin/i2pd"
-command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf"
+command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --pidfile=$pidfile"
 description="i2p router written in C++"
 required_dirs="/var/lib/i2pd"
 required_files="$mainconf"
@@ -22,6 +20,22 @@ depend() {
 }
 
 start_pre() {
-  checkpath -f -o i2pd:adm -w $pidfile
-  checkpath -f -o i2pd:adm -w $logfile
+  if [ -r /etc/default/i2pd ]; then
+    . /etc/default/i2pd
+  fi
+
+  if [ "x$I2PD_ENABLED" != "xyes" ]; then
+    ewarn "i2pd disabled in /etc/default/i2pd"
+    exit 1
+  fi
+
+  checkpath -f -o i2pd:adm $logfile
+  checkpath -f -o i2pd:adm $pidfile
+
+  if [ -n "$I2PD_PORT" -a "$I2PD_PORT" -gt 0 ]; then
+    command_args="$command_args --port=$I2PD_PORT"
+  fi
+  if [ -n "$DAEMON_OPTS" ]; then
+    command_args="$command_args $DAEMON_OPTS"
+  fi
 }