diff --git a/src/etc/sbopkg/sbopkg.conf.sample b/src/etc/sbopkg/sbopkg.conf.sample
index d980bd6..6190013 100644
--- a/src/etc/sbopkg/sbopkg.conf.sample
+++ b/src/etc/sbopkg/sbopkg.conf.sample
@@ -1,4 +1,3 @@
-#!/bin/sh
 # $Id$
 
 RSYNCMIRROR=${RSYNCMIRROR:-slackbuilds.org::slackbuilds}
diff --git a/src/usr/bin/sbopkg b/src/usr/bin/sbopkg
index 3fbcfd4..22262ff 100755
--- a/src/usr/bin/sbopkg
+++ b/src/usr/bin/sbopkg
@@ -24,13 +24,13 @@
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #  
 #  Other contributors:  Bob Lounsbury, Robby Workman, Alan Hicks, Paul
-#  Wisehart, slakmagik (thanks for your diff!)
+#  Wisehart, slakmagik (thanks for your diff!), Eric Hameleers
 
 # Variables
 SCRIPT=${0##*/}
 DIAG=""
 SBOPKG_CONF="${SBOPKG_CONF:-/etc/sbopkg/sbopkg.conf}"
-CWD="$pwd"
+CWD="$(pwd)"
 VER=0.0.4
 
 sanity_checks () {