diff --git a/hush-cli b/hush-cli
index efa1840..bf45110 100755
--- a/hush-cli
+++ b/hush-cli
@@ -2,10 +2,20 @@
 # Copyright (c) 2019 Hush developers
 
 # set working directory to the location of this script
+# readlink -f does not always exist
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
+DIR="$( cd "$( dirname "$( readlink "${BASH_SOURCE[0]}" )" )" && pwd )"
+cd $DIR
 
 NAME=HUSH3
 
 CLI=${KOMODOCLI:-./komodo-cli}
-$CLI -ac_name=$NAME "$@"
+if [ -f $CLI ]; then
+   $CLI -ac_name=$NAME "$@"
+else
+	# We prefix our binary when installed
+	# system wide on Debain system, to prevent clashes
+	CLI=hush-komodo-cli
+    $CLI -ac_name=$NAME "$@"
+fi
diff --git a/win-build.sh b/win-build.sh
old mode 100644
new mode 100755