diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml
index b00a69d7f..1410de03d 100644
--- a/roles/calibre/tasks/debs.yml
+++ b/roles/calibre/tasks/debs.yml
@@ -18,9 +18,13 @@
 # If you want the latest Calibre, run the appropriate below script, standalone.
 # HOWEVER: it's strongly suggested you wait for apt (blessed by your OS!)
 
-- name: Upgrade to Calibre testing .deb's - target Raspbian (rpi)
-  #command: scripts/calibre-install-latest-rpi.sh  #fails with Calibre 3.24 & 3.25, and beyond?
-  command: scripts/calibre-install-latest.sh       #Debian approach works for now (3.24 & 3.25)
+- name: Install packages that Raspbian .deb's had installed for Calibre 3.23 (rpi)
+  #command: scripts/calibre-install-latest-rpi.sh  # FAILS with Calibre 3.24+ ("calibre : Depends: python-pyqt5 (>= 5.10.1+dfsg-2) but 5.10.1+dfsg-1+rpi1 is to be installed") since June 2018.
+  command: scripts/calibre-install-packages.sh     # BORROWED package list from /var/log/apt/history.log (that resulted from 2018-05-22 install of Calibre 3.23 using calibre-install-latest-rpi.sh).
+  when: is_rpi and internet_available
+
+- name: Upgrade to latest Calibre using Debian's own .deb's from testing (rpi)
+  command: scripts/calibre-install-latest.sh       # NECESSARY since Calibre 3.24 (but libc6 will prevent boot in RPi Zero W, if calibre-install-packages.sh isn't run above!)
   when: is_rpi and internet_available
 
 - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18)