diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index 556ead031..097e7b044 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -1,12 +1,12 @@
 # 1. INSTALL THE LATEST CALIBRE 3.X+ (calibre-server etc) ON ALL OS'S
 
 # RUNS IF /usr/bin/calibre-uninstall DOES NOT ALEADY EXIST
-- name: Install Calibre via calibre-installer.py (OS's other than Raspbian)
+- name: Install Calibre via calibre-installer.py (redhat, ubuntu, debian if NOT calibre_debs_on_debian)
   include_tasks: py-installer.yml
   when: is_redhat or is_ubuntu or (is_debian and not calibre_debs_on_debian)
   #when: not is_rpi
 
-- name: Install Calibre via .debs (Raspbian)
+- name: Install Calibre via .debs (Raspbian, Debian if calibre_debs_on_debian)
   include_tasks: debs.yml
   when: is_rpi or (is_debian and calibre_debs_on_debian)
   #when: is_rpi or is_debian     # (is_debian also covers & includes is_rpi)