Prompted by https://bugs.debian.org/1050917 and based on suggestions from @smcv . Thanks!
Closes: #982 (closed)