diff --git a/bashbot.sh b/bashbot.sh
index dfb85c1..67daaf0 100755
--- a/bashbot.sh
+++ b/bashbot.sh
@@ -11,7 +11,7 @@
 # This file is public domain in the USA and all free countries.
 # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
 #
-#### $$VERSION$$ v0.96-dev3-21-g6f86036
+#### $$VERSION$$ v0.96-dev3-23-g02e776c
 #
 # Exit Codes:
 # - 0 sucess (hopefully)
@@ -773,6 +773,7 @@ start_bot() {
 
 # initialize bot environment, user and permissions
 bot_init() {
+	[ -n "${BASHBOT_HOME}" ] && cd "${BASHBOT_HOME}" || exit 1
 	local DEBUG="$1"
 	# upgrade from old version
 	local OLDTMP="${BASHBOT_VAR:-.}/tmp-bot-bash"
diff --git a/dev/make-standalone.sh b/dev/make-standalone.sh
index 4080d15..353f21b 100755
--- a/dev/make-standalone.sh
+++ b/dev/make-standalone.sh
@@ -5,7 +5,7 @@
 # If you your bot is finished you can use make-standalone.sh to create the
 # the old all-in-one bashbot:  bashbot.sh and commands.sh only!
 #
-#### $$VERSION$$ v0.96-dev3-21-g6f86036
+#### $$VERSION$$ v0.96-dev3-22-g19c45c4
 
 # magic to ensure that we're always inside the root of our application,
 # no matter from which directory we'll run script