diff --git a/contrib/debian/default/ebusd b/contrib/debian/default/ebusd
index 723fd1c3..03083742 100644
--- a/contrib/debian/default/ebusd
+++ b/contrib/debian/default/ebusd
@@ -1,5 +1,5 @@
 # /etc/default/ebusd:
-# config file for /etc/init.d/ebusd.
+# config file for ebusd service.
 
-# Options to pass to ebusd:
+# Options to pass to ebusd (run "ebusd -?" for more info):
 EBUSD_OPTS="--scanconfig"
diff --git a/contrib/gentoo/conf.d/ebusd b/contrib/gentoo/conf.d/ebusd
index 9b8c01a0..0d1b7287 100644
--- a/contrib/gentoo/conf.d/ebusd
+++ b/contrib/gentoo/conf.d/ebusd
@@ -1,5 +1,5 @@
 # /etc/conf.d/ebusd:
-# config file for /etc/init.d/ebusd.
+# config file for ebusd service.
 
-# Options to pass to ebusd:
-EBUSD_ARGS="--scanconfig"
+# Options to pass to ebusd (run "ebusd -?" for more info):
+EBUSD_OPTS="--scanconfig"
diff --git a/contrib/gentoo/init.d/ebusd b/contrib/gentoo/init.d/ebusd
old mode 100755
new mode 100644
index 652f626f..9735db35
--- a/contrib/gentoo/init.d/ebusd
+++ b/contrib/gentoo/init.d/ebusd
@@ -4,7 +4,7 @@
 # $Header: $
 
 command="/usr/bin/ebusd"
-command_args="${EBUSD_ARGS}"
+command_args="${EBUSD_OPTS}"
 start_stop_daemon_args="--quiet"
 description="ebusd, the daemon for communication with eBUS heating systems."