diff -Nru clevis-16/debian/changelog clevis-16/debian/changelog
--- clevis-16/debian/changelog	2021-02-10 08:25:29.000000000 +0000
+++ clevis-16/debian/changelog	2021-02-28 15:50:28.000000000 +0000
@@ -1,3 +1,9 @@
+clevis (16-2) unstable; urgency=medium
+
+  * Cherry-pick "Fix issue with multiple encrypted devices"
+
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Sun, 28 Feb 2021 16:50:28 +0100
+
 clevis (16-1) unstable; urgency=medium
 
   * New upstream version 16
diff -Nru clevis-16/debian/patches/cherry-pick/1613255571.v16-2-g0abdfbc.fix-issue-with-multiple-encrypted-devices.patch clevis-16/debian/patches/cherry-pick/1613255571.v16-2-g0abdfbc.fix-issue-with-multiple-encrypted-devices.patch
--- clevis-16/debian/patches/cherry-pick/1613255571.v16-2-g0abdfbc.fix-issue-with-multiple-encrypted-devices.patch	1970-01-01 00:00:00.000000000 +0000
+++ clevis-16/debian/patches/cherry-pick/1613255571.v16-2-g0abdfbc.fix-issue-with-multiple-encrypted-devices.patch	2021-02-28 15:47:16.000000000 +0000
@@ -0,0 +1,19 @@
+Subject: Fix issue with multiple encrypted devices
+Origin: v16-2-g0abdfbc <https://github.com/latchset/clevis/commit/v16-2-g0abdfbc>
+Upstream-Author: Dmitriy P <dpantel@users.noreply.github.com>
+Date: Sat Feb 13 15:32:51 2021 -0700
+
+    There is a separate askpass process (with its own PID) for each
+    encrypted device. So re-get the askpass PID with each loop iteration.
+
+--- a/src/initramfs-tools/scripts/local-top/clevis.in
++++ b/src/initramfs-tools/scripts/local-top/clevis.in
+@@ -130,6 +130,8 @@
+ 
+     while true; do
+ 
++        # Re-get the askpass PID in case there are multiple encrypted devices
++        pid=""
+         until [ "$pid" ] && [ -p "$PASSFIFO" ]; do
+             sleep .1
+             pid_fifo=$(get_askpass_pid)
diff -Nru clevis-16/debian/patches/series clevis-16/debian/patches/series
--- clevis-16/debian/patches/series	2021-02-10 08:25:29.000000000 +0000
+++ clevis-16/debian/patches/series	2021-02-28 15:50:28.000000000 +0000
@@ -1,4 +1,5 @@
 # cherry-picked commits. Keep in upstream's chronological order
+cherry-pick/1613255571.v16-2-g0abdfbc.fix-issue-with-multiple-encrypted-devices.patch
 
 # patches for upstream
 for-upstream/2018-10-30.use-asciidoctor-to-build-manpages.patch