diff --git a/devstack/lib/cyborg b/devstack/lib/cyborg
index b2326786..fa77fa1f 100644
--- a/devstack/lib/cyborg
+++ b/devstack/lib/cyborg
@@ -52,6 +52,19 @@ function cleanup_agent {
     fi
 }
 
+
+function clone_cyborg_client {
+    if [[ "${CYBORG_CLIENT_INSTALL}" == "True" ]]; then
+        git_clone ${CYBORG_CLIENT_REPO} ${CYBORG_CLIENT_DIR} ${CYBORG_CLIENT_BRANCH}
+    fi
+}
+
+function install_cyborg_client {
+    if [[ "${CYBORG_CLIENT_INSTALL}" == "True" ]]; then
+        setup_develop ${CYBORG_CLIENT_DIR}
+    fi
+}
+
 # install_cyborg() - Install the things!
 function install_cyborg {
     # make sure all needed services are enabled
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 0790cff4..c8e2ea11 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -13,10 +13,12 @@ case $1 in
         case $2 in
             "pre-install")
                 pre_install_agent
+                clone_cyborg_client
                 ;;
             "install")
                 echo_summary "Installing Cyborg"
                 install_cyborg
+                install_cyborg_client
                 ;;
             "post-config")
                 # stack/post-config - Called after the layer 0 and 2 services
diff --git a/devstack/settings b/devstack/settings
index 3a633fed..b60ed8be 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -49,3 +49,9 @@ OPAE_DEVEL_PKG=${OPAE_DEVEL_PKG:-"opae-devel"}
 OPAE_DEVEL=${OPAE_DEVEL:-"${OPAE_DEVEL_PKG}-$OPAE_VERSION.x86_64"}
 OPAE_LIBS_PKG=${OPAE_LIBS_PKG:-"opae-libs"}
 OPAE_LIBS=${OPAE_LIBS:-"${OPAE_LIBS_PKG}-$OPAE_VERSION.x86_64"}
+
+# client settings
+CYBORG_CLIENT_INSTALL=$(trueorfalse True CYBORG_CLIENT_INSTALL)
+CYBORG_CLIENT_REPO=${CYBORG_CLIENT_REPO:-"$GIT_BASE/openstack/python-cyborgclient"}
+CYBORG_CLIENT_BRANCH=${CYBORG_CLIENT_BRANCH:-master}
+CYBORG_CLIENT_DIR="${DEST}/python-cyborgclient"