diff --git a/packages/lakka/Bananapi/package.mk b/packages/lakka/Bananapi/package.mk
index 337d87f3c..8db17c42b 100644
--- a/packages/lakka/Bananapi/package.mk
+++ b/packages/lakka/Bananapi/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
+PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Bananapi"
diff --git a/packages/lakka/Generic/package.mk b/packages/lakka/Generic/package.mk
index ce27c6b22..6b94424ff 100644
--- a/packages/lakka/Generic/package.mk
+++ b/packages/lakka/Generic/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="mesa retroarch lutro 4do prosystem bsnes-mercury tyrquake 2048 virtualjaguar ppsspp beetle-vb beetle-wswan desmume beetle-ngp beetle-pcfx beetle-psx mupen64plus vecx snes9x-next dinothawr prboom beetle-pce fba handy genesis-plus-gx nxengine nestopia gambatte stella vbam libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
+PKG_DEPENDS_TARGET="retroarch lutro 4do prosystem bsnes-mercury tyrquake 2048 virtualjaguar ppsspp beetle-vb beetle-wswan desmume beetle-ngp beetle-pcfx beetle-psx mupen64plus vecx snes9x-next dinothawr prboom beetle-pce fba handy genesis-plus-gx nxengine nestopia gambatte stella vbam libretro-ffmpeg"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Generic"
diff --git a/packages/lakka/OdroidC1/package.mk b/packages/lakka/OdroidC1/package.mk
index 5e55dc965..bfdb7b4d4 100644
--- a/packages/lakka/OdroidC1/package.mk
+++ b/packages/lakka/OdroidC1/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
+PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg" 
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for OdroidC1"
diff --git a/packages/lakka/OdroidXU3/package.mk b/packages/lakka/OdroidXU3/package.mk
index 91b612975..2a3266b45 100644
--- a/packages/lakka/OdroidXU3/package.mk
+++ b/packages/lakka/OdroidXU3/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
+PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg" 
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for OdroidXU3"
diff --git a/packages/lakka/RPi/package.mk b/packages/lakka/RPi/package.mk
index 9ef7a7371..f2b150ea0 100644
--- a/packages/lakka/RPi/package.mk
+++ b/packages/lakka/RPi/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch lutro gpsp 2048 vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine fceumm gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
+PKG_DEPENDS_TARGET="retroarch lutro gpsp 2048 vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine fceumm gambatte stella fba libretro-ffmpeg"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for RPi"
diff --git a/packages/lakka/RPi2/package.mk b/packages/lakka/RPi2/package.mk
index fb94cad4b..bc8c43a03 100644
--- a/packages/lakka/RPi2/package.mk
+++ b/packages/lakka/RPi2/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch lutro snes9x-next genesis-plus-gx pcsx_rearmed mupen64plus gpsp 2048 vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
+PKG_DEPENDS_TARGET="retroarch lutro snes9x-next genesis-plus-gx pcsx_rearmed mupen64plus gpsp 2048 vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg" 
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for RPi 2"
diff --git a/packages/lakka/WandBoard/package.mk b/packages/lakka/WandBoard/package.mk
index e2008689b..c39e7ff40 100644
--- a/packages/lakka/WandBoard/package.mk
+++ b/packages/lakka/WandBoard/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch 2048 mupen64plus vba-next dosbox beetle-vb beetle-wswan beetle-ngp beetle-pcfx pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info"
+PKG_DEPENDS_TARGET="retroarch 2048 mupen64plus vba-next dosbox beetle-vb beetle-wswan beetle-ngp beetle-pcfx pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg" 
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for WandBoard"
diff --git a/packages/lakka/WeTek_Play/package.mk b/packages/lakka/WeTek_Play/package.mk
index c90f86361..724eae154 100644
--- a/packages/lakka/WeTek_Play/package.mk
+++ b/packages/lakka/WeTek_Play/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
+PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for WeTek_Play"
diff --git a/packages/lakka/a20/package.mk b/packages/lakka/a20/package.mk
index b6b3d3d0d..64df53465 100644
--- a/packages/lakka/a20/package.mk
+++ b/packages/lakka/a20/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
+PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Cubieboard2 and Cubietruck"
diff --git a/packages/lakka/imx6/package.mk b/packages/lakka/imx6/package.mk
index b0a087732..fbdfdd0d1 100644
--- a/packages/lakka/imx6/package.mk
+++ b/packages/lakka/imx6/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
+PKG_DEPENDS_TARGET="retroarch genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Cuboxi and Hummingboard"
diff --git a/packages/libretro/retroarch/package.mk b/packages/libretro/retroarch/package.mk
index 753ed172a..3e889895c 100644
--- a/packages/libretro/retroarch/package.mk
+++ b/packages/libretro/retroarch/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain alsa-lib freetype retroarch-assets"
+PKG_DEPENDS_TARGET="toolchain alsa-lib freetype retroarch-assets core-info retroarch-joypad-autoconfig common-shaders"
 PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
 PKG_SHORTDESC="Reference frontend for the libretro API."
@@ -36,6 +36,8 @@ PKG_AUTORECONF="no"
 
 if [ "$OPENGLES_SUPPORT" = yes ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES"
+else
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL"
 fi
 
 if [ "$SAMBA_SUPPORT" = yes ]; then