diff --git a/gerrit/client/service.sls b/gerrit/client/service.sls
index e8f34a8..45d1855 100644
--- a/gerrit/client/service.sls
+++ b/gerrit/client/service.sls
@@ -5,7 +5,7 @@
 
 gerrit_client_install:
   pkg.installed:
-  - names: {{ client.source.pkgs }}
+  - names: {{ client.source.pkgs + client.source.pkgs_salt }}
 
 {%- elif client.source.engine == 'pip' %}
 
diff --git a/gerrit/map.jinja b/gerrit/map.jinja
index df564b7..5b38af4 100644
--- a/gerrit/map.jinja
+++ b/gerrit/map.jinja
@@ -20,10 +20,11 @@
   source:
     engine: pkg
     pkgs:
-    - python-gerritlib
-    - python-pygerrit2
     - jeepyb
     - curl
+    pkgs_salt:
+    - python-gerritlib
+    - python-pygerrit2
   dir:
     project_config: {{ project_config }}
     base: /usr/share/jeepyb
diff --git a/gerrit/meta/salt.yml b/gerrit/meta/salt.yml
index aa3fdd1..1be36c8 100644
--- a/gerrit/meta/salt.yml
+++ b/gerrit/meta/salt.yml
@@ -19,3 +19,18 @@
       keyfile: {{ client.config.key }}
       {%- endif %}
   {%- endif %}
+dependency:
+  {% from "gerrit/map.jinja" import client with context %}
+  {%- if client.enabled %}
+  {%- if client.source.engine == 'pkg' %}
+  engine: pkg
+  pkgs: {{ client.source.pkgs_salt }}
+  {%- elif client.source.engine == 'pip' %}
+  engine: pip
+  pkgs:
+    - python-pip
+  python_pkgs:
+    - pygerrit2
+    - "{{ client.get('repo', {}).get('gerritlib', 'git+https://github.com/openstack-infra/gerritlib.git') }}"
+  {%- endif %}
+  {%- endif %}