diff --git a/roles/cleanup/tasks/main.yml b/roles/cleanup/tasks/main.yml
index 8069ce6..bb6aa7e 100644
--- a/roles/cleanup/tasks/main.yml
+++ b/roles/cleanup/tasks/main.yml
@@ -1,6 +1,12 @@
 ---
 
+-   name: check for uncommitted changes
+    command: 'etckeeper unclean'
+    register: etckeeper_unclean
+    failed_when: false
+
 -   name: etckeeper commit
     command: "{{ item }}"
     with_items:
-        - 'etckeeper commit "Ansible (re-)build playbook run"'
\ No newline at end of file
+        - 'etckeeper commit "Ansible (re-)build playbook run"'
+    when: etckeeper_unclean.rc == 0