diff --git a/include/env/init.sh b/include/env/init.sh
index 23850c12..afdbb80f 100644
--- a/include/env/init.sh
+++ b/include/env/init.sh
@@ -12,11 +12,10 @@ sha512sum="util/sbase/sha512sum"
 
 eval "`newvar aur_notice basetmp board checkvarschk checkvarsxbmk configdir \
     datadir is_child python pyver reinstall relname version versiondate \
-    xbmklock xbmkpath xbmkpwd xbmkpwd xbtmp`"
+    xbmklock xbmkpath xbtmp`"
 
 xbmk_init()
 {
-	xbmkpwd="`pwd || err "Cannot generate PWD"`" || err "!" xbmk_init "$@"
 	xbmklock="$xbmkpwd/lock"
 	basetmp="$xbmkpwd/xbmkwd"
 	sha512sum="$xbmkpwd/util/sbase/sha512sum"
diff --git a/mk b/mk
index 49750e3c..0834464c 100755
--- a/mk
+++ b/mk
@@ -21,7 +21,9 @@ xbarg0="$0"
 [ "${xbarg0##*/}" = "$xbarg0" ] && \
     xbarg0="`command -v "$xbarg0"`"
 
-x_ cd "`findpath "$xbarg0"`"
+xbmkpwd="$(dirname "$(findpath "$xbarg0")")"
+
+x_ cd "$xbmkpwd"
 
 . "include/env/init.sh"
 x_ xbmk_init "$@"