diff --git a/tasks/dleyna.yml b/tasks/dleyna.yml
new file mode 100644
index 0000000..a518834
--- /dev/null
+++ b/tasks/dleyna.yml
@@ -0,0 +1,33 @@
+---
+
+- file:
+    path: "{{ '~' | expanduser }}/.config/systemd/user"
+    state: directory
+
+# dleyna process can hang computer shutdown
+# https://github.com/intel/dleyna-renderer/issues/164#issuecomment-616061467
+- copy:
+    dest: "{{ '~' | expanduser }}/.config/systemd/user/dleyna-renderer-service-kill.service"
+    content: |
+      [Unit]
+      Description=Kills the dleyna-rednerer-service
+      
+      [Service]
+      Type=oneshot
+      RemainAfterExit=yes
+      ExecStop=/usr/bin/killall -9 dleyna-renderer-service
+      
+      [Install]
+      WantedBy=graphical-session.target
+  register: dleyna_service
+
+- systemd:
+    name: dleyna-renderer-service-kill
+    enabled: true
+    daemon_reload: "{{ dleyna_service.changed }}"
+    scope: user
+
+- systemd:
+    name: dleyna-renderer-service-kill
+    state: started
+    scope: user
diff --git a/tasks/main.yml b/tasks/main.yml
index 332fdc1..23fdefd 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
 
+- import_tasks: dleyna.yml
+  when: ansible_distribution == 'Fedora'
+
 - import_role:
     name: powo.rpmfusion
   when: ansible_os_family == 'RedHat'