diff --git a/contrib/etc/conf.d/ebusd.gentoo b/contrib/etc/conf.d/ebusd.gentoo
index 51b7f169..9b8c01a0 100644
--- a/contrib/etc/conf.d/ebusd.gentoo
+++ b/contrib/etc/conf.d/ebusd.gentoo
@@ -1,5 +1,5 @@
-# /etc/conf.d/ebusd: config file for /etc/init.d/ebusd
+# /etc/conf.d/ebusd:
+# config file for /etc/init.d/ebusd.
 
-# Options to pass to ebusd
-
-EBUSD_ARGS=""
+# Options to pass to ebusd:
+EBUSD_ARGS="--scanconfig"
diff --git a/contrib/etc/default/ebusd.debian b/contrib/etc/default/ebusd.debian
index fe8b6bd1..723fd1c3 100644
--- a/contrib/etc/default/ebusd.debian
+++ b/contrib/etc/default/ebusd.debian
@@ -1,5 +1,5 @@
-# Default settings for ebusd. This file is sourced by /bin/sh from
-# /etc/init.d/ebusd.
+# /etc/default/ebusd:
+# config file for /etc/init.d/ebusd.
 
-# Options to pass to ebusd
-#EBUSD_OPTS="-d /dev/ttyUSB0"
+# Options to pass to ebusd:
+EBUSD_OPTS="--scanconfig"
diff --git a/contrib/etc/init.d/ebusd.debian b/contrib/etc/init.d/ebusd.debian
index 628a6f64..b4122d6d 100755
--- a/contrib/etc/init.d/ebusd.debian
+++ b/contrib/etc/init.d/ebusd.debian
@@ -1,26 +1,24 @@
 #!/bin/sh
-
+#
 ### BEGIN INIT INFO
 # Provides:        ebusd
 # Required-Start:  $network $remote_fs $syslog
 # Required-Stop:   $network $remote_fs $syslog
 # Default-Start:   2 3 4 5
 # Default-Stop:    0 1 6
-# Short-Description: Start ebusd
+# Short-Description: controls ebusd, the daemon for communication with eBUS heating systems.
 ### END INIT INFO
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
-
-if test -f /etc/default/ebusd; then
-    . /etc/default/ebusd
-fi
-
-. /lib/lsb/init-functions
-
 DAEMON=/usr/bin/ebusd
 PIDFILE=/var/run/ebusd.pid
 
-test -x $DAEMON || exit 5
+. /lib/lsb/init-functions
+[ -r /etc/default/ebusd ] && . /etc/default/ebusd
+
+if [ ! -x $DAEMON ]; then
+	log_failure_msg "$DAEMON is not available or not executable."
+	exit 5
+fi
 
 case $1 in
 	start)
diff --git a/contrib/etc/init.d/ebusd.gentoo b/contrib/etc/init.d/ebusd.gentoo
old mode 100755
new mode 100644
index 9d601d1b..652f626f
--- a/contrib/etc/init.d/ebusd.gentoo
+++ b/contrib/etc/init.d/ebusd.gentoo
@@ -3,19 +3,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-#extra_started_commands="reload"
 command="/usr/bin/ebusd"
 command_args="${EBUSD_ARGS}"
 start_stop_daemon_args="--quiet"
-description="Daemon for eBUS"
+description="ebusd, the daemon for communication with eBUS heating systems."
 
 depend() {
 	need localmount
 	use logger
 }
-
-#reload() {
-#	ebegin "Reloading ebusd configuration"
-#	start-stop-daemon --exec $command --signal HUP
-#	eend $?
-#}