diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml
index 5e174cff8..f34404d8b 100644
--- a/roles/calibre/tasks/debs.yml
+++ b/roles/calibre/tasks/debs.yml
@@ -1,5 +1,5 @@
-# roles/calibre/tasks/main.yml requires calibre_via_debs (to be True) before
-# calling this script.  As of 2018-10-23 this is set in only 3 places:
+# roles/calibre/tasks/main.yml REQUIRES calibre_via_debs (TO BE True) BEFORE
+# CALLING THIS SCRIPT.  As of 2018-10-23 this is set in only 3 places:
 #
 # vars/raspbian-9.yml
 # vars/raspbian-8.yml
@@ -44,9 +44,9 @@
 #  command: scripts/calibre-install-pinned-rpi.sh    # Worked for Calibre 3.33.1 on 2018-10-23, e.g. so IIAB microSD bootable in RPi Zero W
 #  when: is_rpi and internet_available
 
-- name: Install/Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18)
+- name: Install/Upgrade to Calibre testing .deb's (debian-9 or ubuntu-16)
   command: scripts/calibre-install-latest.sh
-  when: (not is_rpi) and (is_ubuntu_16 or is_debian_9) and internet_available
+  when: (not is_rpi) and (is_debian_9 or is_ubuntu_16) and internet_available
   #when: not is_rpi and not is_ubuntu_18 and internet_available
 
 - name: Install/Upgrade to Calibre unstable .deb's IF calibre_unstable_debs