diff --git a/editbootinstall_rpi.sh b/editbootinstall_rpi.sh
index 107cfee..5e5cd40 100644
--- a/editbootinstall_rpi.sh
+++ b/editbootinstall_rpi.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
-
-set -x
+set -euxo pipefail
 
 diskname=$1
 devname="$2"
-loopname="${devname%*p2}"
+loopname="${devname%*p?}"
 loopdev=/dev/${loopname#/dev/mapper/*}
 
 #==========================================
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index d32888a..ef91725 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 15:31:37 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Fix editbootinstall_rpi.sh with newer kiwi
+
 -------------------------------------------------------------------
 Tue Nov 26 13:11:12 UTC 2019 - Fabian Vogt <fvogt@suse.com>