diff --git a/README.rst b/README.rst
index 8b52e14..e16ba66 100644
--- a/README.rst
+++ b/README.rst
@@ -16,16 +16,21 @@ Available states
 ``openssh``
 -----------
 
-Installs the ``openssh`` package and service.
+Installs the ``openssh`` server package and service.
 
 ``openssh.config``
 ------------------
 
-Installs the configuration file included in this formula
+Installs the ssh daemon configuration file included in this formula
 (under "openssh/files"). This configuration file is populated
 by values from pillar. ``pillar.example`` results in the generation
 of the default ``sshd_config`` file on Debian Wheezy.
 
+``openssh.client``
+------------------
+
+Installs the openssh client package.
+
 ``openssh.banner``
 ------------------
 
diff --git a/openssh/client.sls b/openssh/client.sls
new file mode 100644
index 0000000..902e858
--- /dev/null
+++ b/openssh/client.sls
@@ -0,0 +1,5 @@
+{% from "openssh/map.jinja" import openssh with context %}
+
+openssh_client:
+  pkg.installed:
+    - name: {{ openssh.client }}
diff --git a/openssh/map.jinja b/openssh/map.jinja
index 9376e5e..0ba5b62 100644
--- a/openssh/map.jinja
+++ b/openssh/map.jinja
@@ -1,6 +1,7 @@
 {% set openssh = salt['grains.filter_by']({
     'Debian': {
         'server': 'openssh-server',
+        'client': 'openssh-client',
         'service': 'ssh',
         'sshd_config': '/etc/ssh/sshd_config',
         'sshd_config_src': 'salt://openssh/files/sshd_config',
@@ -9,6 +10,7 @@
     },
     'RedHat': {
         'server': 'openssh-server',
+        'client': 'openssh',
         'service': 'sshd',
         'sshd_config': '/etc/ssh/sshd_config',
         'sshd_config_src': 'salt://openssh/files/sshd_config',