diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 4dcc7bcb3e9e04f977e1cc3d7fd9b3073e9e7303..5d5f00eef9128f27c629177d4daa79aebef4903b 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -43,6 +43,11 @@
   apt: name="{{ item }}" state="present"
   with_items: "{{ common_packages }}"
 
+- name: Disable electric-indent-mode for Emacs by default for all users
+  copy: src="01disable-electric-indent-mode.el" dest="/etc/emacs/site-start.d/01disable-electric-indent-mode.el"
+        owner=root group=root mode=644
+  when: "'emacs24' in common_packages or 'emacs24-nox' in common_packages"
+
 - name: Set-up operating system groups
   group: name="{{ item.name }}" gid="{{ item.gid | default(omit) }}" state=present
   with_items: "{{ os_groups }}"