diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index ea839e23..1aeb9c09 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -167,8 +167,8 @@ function install_sahara {
 # install_python_saharaclient() - Collect source and prepare
 function install_python_saharaclient {
     if use_library_from_git "python-saharaclient"; then
-        git_clone_by_name "python-saharaclient"
-        setup_dev_lib "python-saharaclient"
+        git_clone $SAHARACLIENT_REPO $SAHARACLIENT_DIR $SAHARACLIENT_BRANCH
+        setup_develop $SAHARACLIENT_DIR
     fi
 }
 
diff --git a/devstack/settings b/devstack/settings
index dd325c54..9eb9a327 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -2,9 +2,12 @@
 # -------------------------------------
 
 # Set up default directories
-GITDIR["python-saharaclient"]=$DEST/python-saharaclient
+SAHARACLIENT_DIR=$DEST/python-saharaclient
 SAHARA_DIR=$DEST/sahara
 
+SAHARACLIENT_REPO=${SAHARACLIENT_REPO:-${GIT_BASE}/openstack/python-saharaclient.git}
+SAHARACLIENT_BRANCH=${SAHARACLIENT_BRANCH:-master}
+
 SAHARA_CONF_DIR=${SAHARA_CONF_DIR:-/etc/sahara}
 SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf