diff --git a/media-tv/kodi/kodi-16.0.ebuild b/media-tv/kodi/kodi-16.0.ebuild
index 88fe3a1..aad1ccb 100644
--- a/media-tv/kodi/kodi-16.0.ebuild
+++ b/media-tv/kodi/kodi-16.0.ebuild
@@ -8,7 +8,7 @@ EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
+inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs flag-o-matic
 
 CODENAME="Jarvis"
 case ${PV} in
@@ -22,7 +22,7 @@ case ${PV} in
 	SRC_URI="http://mirrors.kodi.tv/releases/source/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz
 		https://github.com/xbmc/xbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz
 		!java? ( http://mirrors.kodi.tv/releases/source/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 
 	S=${WORKDIR}/xbmc-${PV}-${CODENAME}
 	;;
@@ -33,7 +33,7 @@ HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs omxplayer +opengl profile pulseaudio raspberry-pi rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X"
 # gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306
 REQUIRED_USE="
 	|| ( gles opengl )
@@ -106,7 +106,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		>=media-libs/glew-1.5.6
 	)
 	gles? (
-		media-libs/mesa[gles2]
+		raspberry-pi? (
+			media-libs/raspberrypi-userland
+		)
+		!raspberry-pi? (
+			media-libs/mesa[gles2]
+		)
 	)
 	vaapi? ( x11-libs/libva[opengl] )
 	vdpau? (
@@ -119,6 +124,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		x11-libs/libXinerama
 		x11-libs/libXrandr
 		x11-libs/libXrender
+	)
+	raspberry-pi? (
+		media-libs/raspberrypi-userland
+		sys-apps/lsb-release
+	)
+	omxplayer? (
+		media-video/raspberrypi-omxplayer
 	)"
 RDEPEND="${COMMON_DEPEND}
 	!media-tv/xbmc
@@ -208,11 +220,17 @@ src_configure() {
 	# Requiring java is asine #434662
 	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
 
+	if use raspberry-pi ; then
+		append-ldflags -L/opt/vc/lib
+		append-cppflags -I/opt/vc/include
+	fi
+
 	econf \
 		--docdir=/usr/share/doc/${PF} \
 		--disable-ccache \
 		--disable-optimizations \
 		--with-ffmpeg=shared \
+		$(use_with raspberry-pi platform raspberry-pi) \
 		$(use_enable alsa) \
 		$(use_enable airplay) \
 		$(use_enable avahi) \
@@ -227,6 +245,7 @@ src_configure() {
 		$(use_enable midi mid) \
 		$(use_enable mysql) \
 		$(use_enable nfs) \
+		$(use_enable omxplayer player omxplayer) \
 		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
 		$(use_enable pulseaudio pulse) \
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index f6c4d77..a8fd7b1 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -17,8 +17,10 @@
  <flag name="goom">Enable GOOM visualization plugin</flag>
  <flag name="midi">Support MIDI files</flag>
  <flag name="nfs">Enable NFS client support</flag>
+ <flag name="omxplayer">Enable OMXPlayer on Raspberry Pi devices</flag>
  <flag name="projectm">Enable projectM visualization plugin</flag>
  <flag name="pvr">Enable MythTV support</flag>
+ <flag name="raspberry-pi">Enable specific support for Raspberry Pi devices</flag>
  <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
  <flag name="rsxs">Enable really slick X screensavers</flag>
  <flag name="sftp">Support browsing files over SFTP</flag>