diff --git a/Manual.org b/Manual.org
index 59a22f1..ef7b1c9 100644
--- a/Manual.org
+++ b/Manual.org
@@ -932,7 +932,7 @@ install_avahi: true
     name: lirc
     state: present
 
-- name: stop, mask and disable lircd.socket and lircd.service # (the default lirc configuration conflicts with eventlircd)
+- name: stop, mask and disable lircd.socket, lircd.service and lircd-uinput.service # (the default lirc configuration conflicts with eventlircd)
   systemd:
     name: '{{ item }}'
     enabled: no
@@ -941,6 +941,7 @@ install_avahi: true
   with_items:
     - lircd.service
     - lircd.socket
+    - lircd-uinput.service
   ignore_errors: yes
 
 - name: configure vdr to read from a lircd-compatible socket
diff --git a/roles/yavdr-remote/tasks/main.yml b/roles/yavdr-remote/tasks/main.yml
index 07d7ae1..0dcb379 100644
--- a/roles/yavdr-remote/tasks/main.yml
+++ b/roles/yavdr-remote/tasks/main.yml
@@ -16,7 +16,7 @@
     name: lirc
     state: present
 
-- name: stop, mask and disable lircd.socket and lircd.service # (the default lirc configuration conflicts with eventlircd)
+- name: stop, mask and disable lircd.socket, lircd.service and lircd-uinput.service # (the default lirc configuration conflicts with eventlircd)
   systemd:
     name: '{{ item }}'
     enabled: no
@@ -25,6 +25,7 @@
   with_items:
     - lircd.service
     - lircd.socket
+    - lircd-uinput.service
   ignore_errors: yes
 
 - name: configure vdr to read from a lircd-compatible socket