diff --git a/.mailmap b/.mailmap
index 39f4c6088..3c5641a82 100644
--- a/.mailmap
+++ b/.mailmap
@@ -62,3 +62,8 @@ Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
 Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
 Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
 Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>
+Daniel Kolesa <d.kolesa@samsung.com> q66 <quaker66@gmail.com>
+Daniel Kolesa <d.kolesa@samsung.com> q66 <d.kolesa@samsung.com>
+Daniel Kolesa <d.kolesa@samsung.com> Daniel Kolesa <quaker66@gmail.com>
+Daniel Kolesa <d.kolesa@samsung.com> Daniel 'q66' Kolesa <quaker66@gmail.com>
+Daniel Kolesa <d.kolesa@samsung.com> Daniel 'q66' Kolesa <d.kolesa@samsung.com>