diff --git a/devstack/lib/zun b/devstack/lib/zun
index 03a7d4be1..ba59ff57f 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -33,6 +33,10 @@ ZUN_REPO=${ZUN_REPO:-${GIT_BASE}/openstack/higgins.git}
 ZUN_BRANCH=${ZUN_BRANCH:-master}
 ZUN_DIR=$DEST/higgins
 
+GITREPO["python-zunclient"]=${ZUNCLIENT_REPO:-${GIT_BASE}/openstack/python-zunclient.git}
+GITBRANCH["python-zunclient"]=${ZUNCLIENT_BRANCH:-master}
+GITDIR["python-zunclient"]=$DEST/python-zunclient
+
 ZUN_STATE_PATH=${ZUN_STATE_PATH:=$DATA_DIR/zun}
 ZUN_AUTH_CACHE_DIR=${ZUN_AUTH_CACHE_DIR:-/var/cache/zun}
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index c7516754c..0ec3e21db 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -13,11 +13,10 @@ if is_service_enabled zun-api zun-compute; then
         echo_summary "Installing zun"
         install_zun
 
-	# TODO
-        # LIBS_FROM_GIT="${LIBS_FROM_GIT},python-zunclient"
-        # install_zunclient
-
+        LIBS_FROM_GIT="${LIBS_FROM_GIT},python-zunclient"
+        install_zunclient
         cleanup_zun
+
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         echo_summary "Configuring zun"
         configure_zun