diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index f624d8181..7efea2df0 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -1,119 +1,119 @@
 #!/bin/bash
 # puppet        Init script for running the puppet client daemon
 #
 # Author:       Duane Griffin <d.griffin@psenterprise.com>
 #               David Lutterkort <dlutter@redhat.com>
 #
 # chkconfig: - 98 02
 #
 # description: Enables periodic system configuration checks through puppet.
 # processname: puppet
 # config: /etc/sysconfig/puppet
 
 PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
 pidfile=${PIDFILE-/var/run/puppet/agent.pid}
-puppetd=${PUPPETD-/usr/sbin/puppetd}
+puppetd=${PUPPETD-/usr/bin/puppet}
 RETVAL=0
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-PUPPET_OPTS=""
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
+PUPPET_OPTS="agent "
+[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
 [ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --masterport=${PUPPET_PORT}"
 
 # Determine if we can use the -p option to daemon, killproc, and status.
 # RHEL < 5 can't.
 if status | grep -q -- '-p' 2>/dev/null; then
     daemonopts="--pidfile $pidfile"
     pidopts="-p $pidfile"
 fi
 
 # Figure out if the system just booted. Let's assume
 # boot doesn't take longer than 5 minutes
 ## Not used for now
 ##[ -n "$INIT_VERSION" ] && PUPPET_OPTS="${PUPPET_OPTS} --fullrun"
 
 start() {
-    echo -n $"Starting puppet: "
+    echo -n $"Starting puppet agent: "
     daemon $daemonopts $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
     RETVAL=$?
     echo
         [ $RETVAL = 0 ] && touch ${lockfile}
         return $RETVAL
 }
 
 stop() {
-    echo -n $"Stopping puppet: "
+    echo -n $"Stopping puppet agent: "
     killproc $pidopts $puppetd
     RETVAL=$?
     echo
     [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
 }
 
 reload() {
-    echo -n $"Restarting puppet: "
+    echo -n $"Restarting puppet agent: "
     killproc $pidopts $puppetd -HUP
     RETVAL=$?
     echo
     return $RETVAL
 }
 
 restart() {
     stop
     start
 }
 
 rh_status() {
     status $pidopts $puppetd
     RETVAL=$?
     return $RETVAL
 }
 
 rh_status_q() {
     rh_status >/dev/null 2>&1
 }
 
 genconfig() {
-    echo -n $"Generate configuration puppet: "
+    echo -n $"Generate puppet agent configuration: "
     $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
 }
 
 case "$1" in
     start)
         start
     ;;
     stop)
         stop
     ;;
     restart)
         restart
     ;;
     reload|force-reload)
         reload
     ;;
     condrestart|try-restart)
         rh_status_q || exit 0
         restart
     ;;
     status)
         rh_status
     ;;
     once)
         shift
-        $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
+        $puppetd ${PUPPET_OPTS} --onetime ${PUPPET_EXTRA_OPTS} $@
         ;;
     genconfig)
         genconfig
     ;;
     *)
         echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
         exit 1
 esac
 
 exit $RETVAL
diff --git a/conf/redhat/queue.init b/conf/redhat/queue.init
index a704c3689..ba7cf3d06 100644
--- a/conf/redhat/queue.init
+++ b/conf/redhat/queue.init
@@ -1,102 +1,105 @@
 #!/bin/bash
 # puppetqueue   Init script for running the puppet queue daemon
 #
 # chkconfig: - 65 45
 #
 # description: Processes entities in a queue as they are recieved.
 # processname: puppetqd
 # config: /etc/sysconfig/puppetqueue
 
 PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 
 [ -f /etc/sysconfig/puppetqueue ] && . /etc/sysconfig/puppetqueue
 lockfile=${LOCKFILE-/var/lock/subsys/puppetqd}
 pidfile=${PIDFILE-/var/run/puppet/queue.pid}
-puppetqd=${PUPPETQD-/usr/sbin/puppetqd}
+puppetqd=${PUPPETQD-/usr/bin/puppet}
 RETVAL=0
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+PUPPET_OPTS="queue "
+[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
+
 # Determine if we can use the -p option to daemon, killproc, and status.
 # RHEL < 5 can't.
 if status | grep -q -- '-p' 2>/dev/null; then
     daemonopts="--pidfile $pidfile"
     pidopts="-p $pidfile"
 fi
 
 start() {
-    echo -n $"Starting puppetqd: "
-    daemon $daemonopts $puppetqd
+    echo -n $"Starting puppet queue: "
+    daemon $daemonopts $puppetqd ${PUPPET_OPTS}
     RETVAL=$?
     echo
         [ $RETVAL = 0 ] && touch ${lockfile}
         return $RETVAL
 }
 
 stop() {
-    echo -n $"Stopping puppetqd: "
+    echo -n $"Stopping puppet queue: "
     killproc $pidopts $puppetqd
     RETVAL=$?
     echo
     [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
 }
 
 reload() {
-    echo -n $"Restarting puppetqd: "
+    echo -n $"Restarting puppet queue: "
     killproc $pidopts $puppetqd -HUP
     RETVAL=$?
     echo
     return $RETVAL
 }
 
 restart() {
     stop
     start
 }
 
 rh_status() {
     status $pidopts $puppetqd
     RETVAL=$?
     return $RETVAL
 }
 
 rh_status_q() {
     rh_status >/dev/null 2>&1
 }
 
 genconfig() {
-    echo -n $"Generate configuration puppetqd: "
-    $puppetqd --genconfig
+    echo -n $"Generate puppet queue configuration: "
+    $puppetqd ${PUPPET_OPTS} --genconfig
 }
 
 case "$1" in
     start)
         start
     ;;
     stop)
         stop
     ;;
     restart)
         restart
     ;;
     reload|force-reload)
         reload
     ;;
     condrestart|try-restart)
         rh_status_q || exit 0
         restart
     ;;
     status)
         rh_status
     ;;
     genconfig)
         genconfig
     ;;
     *)
         echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
         exit 1
 esac
 
 exit $RETVAL
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 4d3a72c0e..c45e7ba8a 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -1,143 +1,143 @@
 #!/bin/bash
 # puppetmaster  This shell script enables the puppetmaster server.
 #
 # Authors:       Duane Griffin <d.griffin@psenterprise.com>
 #                Peter Meier <peter.meier@immerda.ch> (Mongrel enhancements)
 #
 # chkconfig: - 65 45
 #
 # description: Server for the puppet system management tool.
 # processname: puppetmaster
 
 PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 
 lockfile=/var/lock/subsys/puppetmaster
 pidfile=/var/run/puppet/master.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
 if [ -f /etc/sysconfig/puppetmaster ]; then
     . /etc/sysconfig/puppetmaster
 fi
 
-PUPPETMASTER_OPTS=""
-[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="--manifest=${PUPPETMASTER_MANIFEST}"
+PUPPETMASTER_OPTS="master "
+[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --manifest=${PUPPETMASTER_MANIFEST}"
 if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
-    PUPPETMASTER_OPTS="$PUPPETMASTER_OPTS --servertype=mongrel"
+    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --servertype=mongrel"
 elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
     PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
 fi
 [ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest ${PUPPETMASTER_LOG}"
 PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
     ${PUPPETMASTER_EXTRA_OPTS}"
 
 # Determine if we can use the -p option to daemon, killproc, and status.
 # RHEL < 5 can't.
 if status | grep -q -- '-p' 2>/dev/null; then
     daemonopts="--pidfile $pidfile"
     pidopts="-p $pidfile"
 fi
 
 RETVAL=0
 
 prog=puppetmasterd
-PUPPETMASTER=/usr/sbin/$prog
+PUPPETMASTER=/usr/bin/puppet
 
 start() {
     echo -n $"Starting puppetmaster: "
 
     # Confirm the manifest exists
     if [ -r $PUPPETMASTER_MANIFEST ]; then
         if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
             for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
                 echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
                 daemon $PUPPETMASTER $PUPPETMASTER_OPTS --masterport=${PUPPETMASTER_PORTS[$i]} --pidfile=/var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid
                 ret=$?; [ $ret != 0 ] && RETVAL=$ret
             done
         else
             daemon $daemonopts $PUPPETMASTER $PUPPETMASTER_OPTS
             RETVAL=$?
         fi
     else
         failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST"
         echo
         return 1
     fi
     [ $RETVAL -eq 0 ] && touch "$lockfile"
     echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping puppetmaster: "
     if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
         for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
             echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
             killproc -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster
             ret=$?; [ $ret != 0 ] && RETVAL=$ret
         done
     else
         killproc $pidopts $PUPPETMASTER
         RETVAL=$?
     fi
     echo
     [ $RETVAL -eq 0 ] && rm -f "$lockfile"
     return $RETVAL
 }
 
 restart() {
   stop
   start
 }
 
 genconfig() {
   echo -n $"Generate configuration puppetmaster: "
   $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
 }
 
 rh_status() {
     if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
         for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
             echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
             status -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster
             ret=$?; [ $ret != 0 ] && RETVAL=$ret
         done
     else
         status $pidopts $PUPPETMASTER
         RETVAL=$?
     fi
     return $RETVAL
 }
 
 rh_status_q() {
         rh_status >/dev/null 2>&1
 }
 
 case "$1" in
   start)
       start
     ;;
     stop)
         stop
     ;;
     restart|reload|force-reload)
         restart
     ;;
     condrestart)
         rh_status_q || exit 0
         restart
     ;;
     status)
         rh_status
     ;;
     genconfig)
         genconfig
     ;;
     *)
         echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
         exit 1
 esac
 
 exit $RETVAL