diff --git a/JeOS.kiwi b/JeOS.kiwi
index 4ceb7de..be14e9c 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -240,7 +240,7 @@
             devicepersistency="by-uuid"
             btrfs_quota_groups="true"
             btrfs_root_is_snapshot="true"
-            efipartsize="16"
+            efipartsize="64"
             editbootinstall="editbootinstall_rpi.sh"
         >
             <systemdisk>
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 713235c..1111ff9 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 26 11:25:53 UTC 2020 - Nicolas Patricio Saenz Julienne <nsaenzjulienne@suse.com>
+
+- Make RPi's EFI partition 64MB big (bsc#1164817)
+
 -------------------------------------------------------------------
 Tue Feb  4 08:55:36 UTC 2020 - Fabian Vogt <fvogt@suse.com>