diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cdae585f2..e793763f5 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -139,12 +139,9 @@ function _install_mistraldashboard {
 
 function install_mistral_pythonclient {
     if use_library_from_git "python-mistralclient"; then
-        git_clone $MISTRAL_PYTHONCLIENT_REPO $MISTRAL_PYTHONCLIENT_DIR $MISTRAL_PYTHONCLIENT_BRANCH
-        local tags=`git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -l | grep 2015`
-        if [ ! "$tags" = "" ]; then
-            git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -d $tags
-        fi
-        setup_develop $MISTRAL_PYTHONCLIENT_DIR
+        git_clone_by_name "python-mistralclient"
+        setup_dev_lib "python-mistralclient"
+        sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-mistralclient"]}/tools/,/etc/bash_completion.d/}mistral.bash_completion
     fi
 }
 
diff --git a/devstack/settings b/devstack/settings
index 5f8c6032f..5a8bcaa02 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -19,17 +19,17 @@ MISTRAL_BRANCH=${MISTRAL_BRANCH:-master}
 MISTRAL_DASHBOARD_REPO=${MISTRAL_DASHBOARD_REPO:-${GIT_BASE}/openstack/mistral-dashboard.git}
 MISTRAL_DASHBOARD_BRANCH=${MISTRAL_DASHBOARD_BRANCH:-master}
 
-MISTRAL_PYTHONCLIENT_REPO=${MISTRAL_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-mistralclient.git}
-MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-master}
-MISTRAL_PYTHONCLIENT_DIR=$DEST/python-mistralclient
-
 MISTRAL_LIB_REPO=${MISTRAL_LIB_REPO:-${GIT_BASE}/openstack/mistral-lib.git}
 MISTRAL_LIB_BRANCH=${MISTRAL_LIB_BRANCH:-master}
-MISTRAL_LIB_DIR=$DEST/mistral-lib
+MISTRAL_LIB_DIR=${DEST}/mistral-lib
+
+GITDIR["python-mistralclient"]=${DEST}/python-mistralclient
+GITREPO["python-mistralclient"]=${MISTRALCLIENT_REPO:-${GIT_BASE}/openstack/python-mistralclient.git}
+GITBRANCH["python-mistralclient"]=${MISTRALCLIENT_BRANCH:-master}
 
 # Set up default directories
-MISTRAL_DIR=$DEST/mistral
-MISTRAL_DASHBOARD_DIR=$DEST/mistral-dashboard
+MISTRAL_DIR=${DEST}/mistral
+MISTRAL_DASHBOARD_DIR=${DEST}/mistral-dashboard
 MISTRAL_CONF_DIR=${MISTRAL_CONF_DIR:-/etc/mistral}
 MISTRAL_CONF_FILE=${MISTRAL_CONF_DIR}/mistral.conf
 MISTRAL_DEBUG=${MISTRAL_DEBUG:-True}