diff --git a/src/init.d/vpoller-proxy.gentoo b/src/init.d/vpoller-proxy.gentoo
index 7671e8b..714d098 100755
--- a/src/init.d/vpoller-proxy.gentoo
+++ b/src/init.d/vpoller-proxy.gentoo
@@ -29,15 +29,15 @@ checkconfig() {
 start() {
   checkconfig || return 1
 
-	ebegin "Starting ${DESC}"
-	if [ ! -d ${CONF_DIR} ]; then
-		eend 1 "${CONF_DIR} does not exist"
-		return 1
-	fi
-	if [ ! -f ${CONF_FILE} ]; then
-		eend 1 "${CONF_FILE} does not exist"
-		return 1
-	fi
+  ebegin "Starting ${DESC}"
+  if [ ! -d ${CONF_DIR} ]; then
+    eend 1 "${CONF_DIR} does not exist"
+    return 1
+  fi
+  if [ ! -f ${CONF_FILE} ]; then
+    eend 1 "${CONF_FILE} does not exist"
+    return 1
+  fi
 #	if [ -f ${PID_FILE} ]; then
 #    rm ${PID_FILE}
 #	fi
@@ -51,9 +51,11 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping ${DESC}"
-  ${DAEMON} -e ${MGMT_INTERFACE} stop >/dev/null 2>&1
-	eend
+  ebegin "Stopping ${DESC}"
+#  ${DAEMON} -e ${MGMT_INTERFACE} stop >/dev/null 2>&1
+  start-stop-daemon --stop --pidfile ${PID_FILE}
+  eend $?
+
 }
 
 fullstatus() {
diff --git a/src/init.d/vpoller-worker.gentoo b/src/init.d/vpoller-worker.gentoo
index 503fc63..eac2888 100755
--- a/src/init.d/vpoller-worker.gentoo
+++ b/src/init.d/vpoller-worker.gentoo
@@ -30,15 +30,15 @@ checkconfig() {
 start() {
   checkconfig || return 1
 
-	ebegin "Starting ${DESC}"
-	if [ ! -d ${CONF_DIR} ]; then
-		eend 1 "${CONF_DIR} does not exist"
-		return 1
-	fi
-	if [ ! -f ${CONF_FILE} ]; then
-		eend 1 "${CONF_FILE} does not exist"
-		return 1
-	fi
+  ebegin "Starting ${DESC}"
+  if [ ! -d ${CONF_DIR} ]; then
+    eend 1 "${CONF_DIR} does not exist"
+    return 1
+  fi
+  if [ ! -f ${CONF_FILE} ]; then
+    eend 1 "${CONF_FILE} does not exist"
+    return 1
+  fi
 #  if [ -f ${PID_FILE} ]; then
 #    rm ${PID_FILE}
 #  fi
@@ -53,9 +53,10 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping ${DESC}"
-  ${DAEMON} -e ${MGMT_INTERFACE} stop >/dev/null 2>&1
-	eend
+  ebegin "Stopping ${DESC}"
+#  ${DAEMON} -e ${MGMT_INTERFACE} stop >/dev/null 2>&1
+  start-stop-daemon --stop --pidfile ${PID_FILE}
+  eend
 }
 
 fullstatus() {