diff --git a/nfs-client/defaults/main.yml b/nfs-client/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bbc0b8651eb9dc6211b93843497ce585b3c1c5f0
--- /dev/null
+++ b/nfs-client/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+
+nfs_enable_cifs: False
+nfs_enable_quota: False
diff --git a/nfs-client/tasks/main.yml b/nfs-client/tasks/main.yml
index b11c6c3a013910af6e68e0a51e9e5284edbd0ee6..88640e1bc122478cc8679c5e294aa8babe2af7e3 100644
--- a/nfs-client/tasks/main.yml
+++ b/nfs-client/tasks/main.yml
@@ -12,6 +12,23 @@
     - nfs-client
     - packages
 
+- name: ensure cifs client utils are installed
+  apt: name="{{ item }}" state=installed
+  with_items:
+    - cifs-utils
+    - smbclient
+  when: nfs_enable_cifs
+  tags:
+    - nfs-client
+    - packages
+
+- name: ensure quota tools are installed
+  apt: name=quota state=installed
+  when: nfs_enable_quota
+  tags:
+    - nfs-client
+    - packages
+
 - name: ensure the nfs-common service is configured for nfs4
   copy: src=nfs-common dest=/etc/default/nfs-common owner=root group=root mode=0644
   notify: