diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 94a8cd8a62..ca1cae2ad0 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -47,7 +47,14 @@ endif
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 KODI_DEPENDENCIES += rpi-userland
-KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
+# Kodi has specific configuration flags for RPi/RPi2. Configure for a
+# RPi2 when we're sure, fallback to RPi otherwise.
+ifeq ($(BR2_cortex_a7),y)
+KODI_CONF_OPTS += --with-platform=raspberry-pi2
+else
+KODI_CONF_OPTS += --with-platform=raspberry-pi
+endif
+KODI_CONF_OPTS += --enable-player=omxplayer
 KODI_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
 	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
 	LIBS="-lvcos -lvchostif"