diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e3ec917..12f8ffcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The **patch** part changes incrementally at each release.
 
 ### Added
 * etc-git: manage a cron job to monitor uncommited changes in /etc/.git (default: `True`)
+* evolinux-users: add user to /etc/aliases
 * webapps/evoadmin-web: add users to /etc/aliases
 
 ### Changed
diff --git a/evolinux-users/tasks/user.yml b/evolinux-users/tasks/user.yml
index bd480cfb..9859db2f 100644
--- a/evolinux-users/tasks/user.yml
+++ b/evolinux-users/tasks/user.yml
@@ -41,6 +41,20 @@
     - loginisbusy.rc != 0
     - uidisbusy.rc   == 0
 
+- name: Is /etc/aliases present?
+  stat:
+    path: /etc/aliases
+  register: etc_aliases
+
+- name: Set mail alias
+  lineinfile:
+    state: present
+    dest: /etc/aliases
+    line: '{{ user.name }}: root'
+    regexp: '^{{ user.name }}:'
+  when: etc_aliases.stat.exists
+  notify: "newaliases"
+
 # Unix groups
 
 ## Group for SSH authorizations