--- configure.orig	2006-04-04 21:37:03.000000000 +0000
+++ configure	2009-07-04 12:37:16.225280000 +0000
@@ -1,13 +1,6 @@
 #!/bin/sh
 #
 
-#Pipe into bash if it's present
-
-if [ "`bash --version 2>&1|grep 'GNU bash'`" != "" -a "$BASH_VERSION" = "" ]; then
-    exec bash $0 $*
-    exit
-fi
-
 umask 007
 
 OLD_LANG="$LANG" 
@@ -73,7 +66,7 @@
 LANGUAGES="`ls  -d locale/[a-z]*|sed 's?^locale\/??g'`"
 LANGUAGES=`echo $LANGUAGES`
 
-SPOOLDIR="/var/spool/qscan"
+SPOOLDIR="/var/spool/qscand"
 QMAILDIR="/var/qmail"
 
 BINDIR="$QMAILDIR/bin"
@@ -1276,7 +1269,7 @@
 if [ "$MIME_UNPACKER" = "reformime" ]; then
 #Check version of maildrop to ensure it's not the buggy version
 
-DD="`$MAILDROP_BINARY -v 2>&1|grep '^maildrop'|grep '1\.0'`"
+DD="`$MAILDROP_BINARY -v 2>&1|grep '^maildrop 1\.0'`"
 if [ "$DD" != "" ]; then
     cat<<EOF
 
