1 files changed, 3 insertions, 2 deletions
diff --git a/watch-bz b/watch-bz
index 26290a1..d766d94 100755
--- a/watch-bz
+++ b/watch-bz
@@ -33,10 +33,11 @@ BZPASSWORD=
 [ -f ~/.watchbzrc ] && source ~/.watchbzrc
 
 # guess correct paths
-if [ -z "$BUGZILLA" ]; then
+if [ -z "$BUGZILLA" ] || [ -n "${BUGZILLA_ROOT}" ]; then
 	# BUGZILLA_ROOT (path to local repo) should rather be set in ~/.watchbzrc
 	BUGZILLA="${BUGZILLA_ROOT}/bin/bugzilla"
-	export PYTHONPATH="${BUGZILLA_ROOT}:${PYTHONPATH}"
+	PYTHONPATH=${PYTHONPATH:+:${PYTHONPATH}}
+	export PYTHONPATH="${BUGZILLA_ROOT}${PYTHONPATH}"
 fi
 
 # hardcoded for now (note the SEP - OUTPUT_FMT relationship)