diff --git a/powerline/bindings/bash/powerline.sh b/powerline/bindings/bash/powerline.sh
index dabacfa9..8e3782d6 100644
--- a/powerline/bindings/bash/powerline.sh
+++ b/powerline/bindings/bash/powerline.sh
@@ -54,13 +54,14 @@ _powerline_set_prompt() {
 _powerline_setup_prompt() {
 	VIRTUAL_ENV_DISABLE_PROMPT=1
 	if test -z "${POWERLINE_COMMAND}" ; then
-		if which powerline-client &>/dev/null ; then
-			export POWERLINE_COMMAND=powerline-client
-		elif which powerline &>/dev/null ; then
+		if which powerline &>/dev/null ; then
 			export POWERLINE_COMMAND=powerline
+		elif which powerline-render &>/dev/null ; then
+			export POWERLINE_COMMAND=powerline-render
 		else
 			# `$0` is set to `-bash` when using SSH so that won't work
-			export POWERLINE_COMMAND="$(dirname "$BASH_SOURCE")/../../../scripts/powerline"
+			local powerline_dir="$(dirname "$BASH_SOURCE")/../../.."
+			export POWERLINE_COMMAND="$powerline_dir/scripts/powerline"
 		fi
 	fi
 	test "x$PROMPT_COMMAND" != "x${PROMPT_COMMAND%_powerline_set_prompt*}" ||
diff --git a/powerline/bindings/fish/powerline-setup.fish b/powerline/bindings/fish/powerline-setup.fish
index 35ec5763..32f50131 100644
--- a/powerline/bindings/fish/powerline-setup.fish
+++ b/powerline/bindings/fish/powerline-setup.fish
@@ -20,10 +20,10 @@ function powerline-setup
 
 	if test -z "$POWERLINE_NO_FISH_PROMPT$POWERLINE_NO_SHELL_PROMPT"
 		if test -z "$POWERLINE_COMMAND"
-			if which powerline-client >/dev/null
-				set -g -x POWERLINE_COMMAND powerline-client
-			else if which powerline >/dev/null
+			if which powerline >/dev/null
 				set -g -x POWERLINE_COMMAND powerline
+			else if which powerline-render >/dev/null
+				set -g -x POWERLINE_COMMAND powerline-render
 			else
 				set -g -x POWERLINE_COMMAND (dirname (status -f))/../../../scripts/powerline
 			end
diff --git a/powerline/bindings/tcsh/powerline.tcsh b/powerline/bindings/tcsh/powerline.tcsh
index 931b9ab0..1ff61cb2 100644
--- a/powerline/bindings/tcsh/powerline.tcsh
+++ b/powerline/bindings/tcsh/powerline.tcsh
@@ -11,10 +11,10 @@ if ! ( $?POWERLINE_NO_TCSH_TMUX_SUPPORT || $?POWERLINE_NO_SHELL_TMUX_SUPPORT ) t
 endif
 if ! ( $?POWERLINE_NO_TCSH_PROMPT || $?POWERLINE_NO_SHELL_PROMPT ) then
 	if ! $?POWERLINE_COMMAND then
-		if ( { which powerline-client > /dev/null } ) then
-			setenv POWERLINE_COMMAND powerline-client
-		else if ( { which powerline > /dev/null } ) then
+		if ( { which powerline > /dev/null } ) then
 			setenv POWERLINE_COMMAND powerline
+		else if ( { which powerline-render > /dev/null } ) then
+			setenv POWERLINE_COMMAND powerline-render
 		else
 			setenv POWERLINE_COMMAND $POWERLINE_SOURCED:h:h:h:h:q/scripts/powerline
 		endif
diff --git a/powerline/bindings/tmux/powerline.conf b/powerline/bindings/tmux/powerline.conf
index a55b4856..31f7be40 100644
--- a/powerline/bindings/tmux/powerline.conf
+++ b/powerline/bindings/tmux/powerline.conf
@@ -1,4 +1,4 @@
-if-shell 'test -z "$POWERLINE_COMMAND"' 'if-shell "which powerline-client" "set-environment -g POWERLINE_COMMAND powerline-client" "set-environment -g POWERLINE_COMMAND powerline"'
+if-shell 'test -z "$POWERLINE_COMMAND"' 'if-shell "which powerline" "set-environment -g POWERLINE_COMMAND powerline" "set-environment -g POWERLINE_COMMAND powerline-render"'
 if-shell 'test -z "$POWERLINE_CONFIG_COMMAND"' 'set-environment -g POWERLINE_CONFIG_COMMAND powerline-config'
 
 # Don't version-check for this core functionality -- anything too old to
diff --git a/powerline/bindings/zsh/powerline.zsh b/powerline/bindings/zsh/powerline.zsh
index 096d0ff4..a9717749 100644
--- a/powerline/bindings/zsh/powerline.zsh
+++ b/powerline/bindings/zsh/powerline.zsh
@@ -124,10 +124,10 @@ _powerline_setup_prompt() {
 		zpython 'del _powerline_setup'
 	else
 		if test -z "${POWERLINE_COMMAND}" ; then
-			if which powerline-client &>/dev/null ; then
-				export POWERLINE_COMMAND=powerline-client
-			elif which powerline &>/dev/null ; then
+			if which powerline &>/dev/null ; then
 				export POWERLINE_COMMAND=powerline
+			elif which powerline-render &>/dev/null ; then
+				export POWERLINE_COMMAND=powerline-render
 			else
 				export POWERLINE_COMMAND="$0:A:h:h:h:h/scripts/powerline"
 			fi