diff -x *,v -ur hylafax-v4.0pl2.orig/etc/faxsetup.sh.in hylafax-v4.0pl2/etc/faxsetup.sh.in
--- hylafax-v4.0pl2.orig/etc/faxsetup.sh.in	Tue Sep  1 18:34:23 1998
+++ hylafax-v4.0pl2/etc/faxsetup.sh.in	Tue Sep  1 18:58:46 1998
@@ -104,6 +104,14 @@
 POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
 
 #
+# Location of sysv init script
+#
+
+SYSVINIT=/etc/rc.d/init.d/hylafax
+FAXQ_SERVER=1
+HFAXD_SERVER=1
+
+#
 # These are the configuration parameters written to the
 # setup.cache file and read in by all the HylaFAX scripts.
 #
@@ -121,8 +129,10 @@
 CP
 DPSRIP		PATH_DPSRIP
 ECHO
+FAXQ_SERVER
 GREP
 GSRIP		PATH_GSRIP
+HFAXD_SERVER
 IMPRIP		PATH_IMPRIP
 LIBDATA		DIR_LIBDATA
 LIBEXEC		DIR_LIBEXEC
@@ -140,6 +150,7 @@
 SED
 SENDMAIL	PATH_SENDMAIL
 SPOOL		DIR_SPOOL
+SYSVINIT
 TIFFBIN
 UUCP_LOCKDIR	DIR_LOCKS
 UUCP_LOCKTYPE	LOCKS"
@@ -1648,9 +1659,21 @@
 #
 if onServer; then
     signalINETD=no
-    if [ -f /etc/init.d/hylafax ]; then
-	true					# started by init at boot time
-    elif [ -f $INETDCONF ]; then
+    if [ -f $SYSVINIT ]; then
+	# started by init at boot time
+        if [ $FAXQ_SERVER -eq 0 ]; then
+            cat <<EOF
+
+Warning faxq will NOT be automatically started on reboot!
+
+EOF
+            true
+        fi
+    else
+        $FAXQ_SERVER=0
+        $HFAXD_SERVER=0
+    fi
+    if [ -f $INETDCONF -a $HFAXD_SERVER -eq 0 ]; then
 	E="hylafax	stream	tcp	nowait	$FAX	$DIR_LIBEXEC/hfaxd	hfaxd -I"
 	editInetdConf()
 	{
@@ -1729,7 +1752,7 @@
 		isOK "$x" && editInetdConf
 	    fi
 	fi
-    else
+    elif [ ! -f $INETDCONF -a $HFAXD_SERVER -eq 0 ]; then
 	cat<<EOF
 
 
@@ -2136,9 +2159,9 @@
     prompt "Should I restart the HylaFAX server processes [yes]?"; read x
     if isOK "$x"; then
 	echo ""
-	if [ -x /etc/init.d/hylafax ]; then
-	    echo /etc/init.d/hylafax start
-	    /etc/init.d/hylafax start
+	if [ -x $SYSVINIT ]; then
+	    echo $SYSVINIT start
+	    $SYSVINIT start
 	else
 	    echo $DIR_SBIN/faxq; $DIR_SBIN/faxq
 	fi
diff -x *,v -ur hylafax-v4.0pl2.orig/etc/hylafax.in hylafax-v4.0pl2/etc/hylafax.in
--- hylafax-v4.0pl2.orig/etc/hylafax.in	Tue Sep  1 18:34:23 1998
+++ hylafax-v4.0pl2/etc/hylafax.in	Tue Sep  1 18:58:46 1998
@@ -56,6 +56,13 @@
 }
 . $SPOOL/etc/setup.cache
 
+if [ -z $HFAXD_SERVER ]; then
+    HFAXD_SERVER=1
+fi
+if [ -z $FAXQ_SERVER ]; then
+    FAXQ_SERVER=1
+fi
+
 IS_ON=/etc/chkconfig		# NB: chkconfig is IRIX-specific
 FAXQ=$SBIN/faxq
 HFAXD=$LIBEXEC/hfaxd
@@ -69,7 +76,7 @@
 fi
 
 if $IS_ON verbose ; then
-    ECHO=echo
+    ECHO="echo -e"
 else		# For a quiet startup and shutdown
     ECHO=:
 fi
@@ -104,11 +111,15 @@
 	    killall -15 faxq
 	    killall -15 hfaxd
 	    $ECHO "HylaFAX:\c"
-	    $FAXQ; $ECHO " faxq\c"
+            if test $FAXQ_SERVER -ne 0 ; then
+	        $FAXQ; $ECHO " faxq\c"
+            fi
 #  Old protocol is insecure, and SNPP probably not needed, change as needed
 #	    $HFAXD -i $FAXPORT -o 4557 -s $SNPPPORT
 #		$ECHO " hfaxd (w/ compatibility & SNPP)\c"
-	    $HFAXD -i $FAXPORT
+            if test $HFAXD_SERVER -ne 0 ; then
+	        $HFAXD -i $FAXPORT
+            fi
 		$ECHO " hfaxd (without old protocol & SNPP)\c"
 	    $ECHO "."
 	fi
