diff --git a/playbook.yml b/playbook.yml
index 4831caa..4418ea6 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -6,6 +6,7 @@
     - { role: grsec, tags: ['grsec'] }
     - { role: ssh, tags: ['ssh'] }
     - { role: dotfiles, tags: ['dotfiles'] }
+    - { role: ssd, tags: ['ssd'] }
     - { role: fonts, tags: ['fonts'] }
     - { role: x, tags: ['x'] }
     - { role: slim, tags: ['slim'] }
diff --git a/roles/ssd/tasks/main.yml b/roles/ssd/tasks/main.yml
new file mode 100644
index 0000000..0e50842
--- /dev/null
+++ b/roles/ssd/tasks/main.yml
@@ -0,0 +1,9 @@
+---
+- name: Check for TRIM support
+  shell: "hdparm -I /dev/sda | grep TRIM"
+  register: hdparm
+  ignore_errors: True
+
+- name: Enable and start weekly filesystem TRIM timer
+  service: name=fstrim.timer enabled=yes state=started
+  when: "hdparm.rc == 0"