diff --git a/JeOS.kiwi b/JeOS.kiwi
index 1d405be..c669089 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -357,6 +357,7 @@
         <!-- For WiFi: -->
         <package name="jeos-firstboot-rpiwifi"/>
         <package name="bcm43xx-firmware"/>
+        <package name="kernel-firmware"/><!-- Fix choice between kernel-firmware and kernel-firmware-all -->
     </packages>
 
 <!-- TW does not have those release packages
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index f74fa9d..4970520 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 30 07:56:11 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add kernel-firmware for RPi
+
 -------------------------------------------------------------------
 Mon Sep 23 08:20:56 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/kiwi-templates-JeOS.spec b/kiwi-templates-JeOS.spec
index e3ba2b0..49ed476 100644
--- a/kiwi-templates-JeOS.spec
+++ b/kiwi-templates-JeOS.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #