diff --git a/Makefile b/Makefile
index bd79e47a3e..95a230794e 100644
--- a/Makefile
+++ b/Makefile
@@ -237,6 +237,8 @@ ifeq ($(HAVE_OPENGL), 1)
 
    ifeq ($(HAVE_VIDEOCORE), 1)
       OBJ += gfx/context/vc_egl_ctx.o
+      DEFINES += $(EGL_CFLAGS)
+      LIBS += $(EGL_LIBS)
    endif
 
    ifeq ($(HAVE_MALI_FBDEV), 1)
@@ -386,10 +388,10 @@ endif
 
 CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I.
 ifeq ($(CXX_BUILD), 1)
-   LD = $(CXX)
+   LINK = $(CXX)
    CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS
 else
-   LD = $(CC)
+   LINK = $(CC)
    ifneq ($(GNU90_BUILD), 1)
       ifneq ($(findstring icc,$(CC)),)
          CFLAGS += -std=c99 -D_GNU_SOURCE
@@ -426,7 +428,7 @@ config.mk: configure qb/*
 
 retroarch: $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LD) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
 
 tools/retroarch-joyconfig: $(RARCH_JOYCONFIG_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
@@ -438,7 +440,7 @@ endif
 
 tools/retrolaunch/retrolaunch: $(RARCH_RETROLAUNCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LD) -o $@ $(RARCH_RETROLAUNCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+	$(Q)$(LINK) -o $@ $(RARCH_RETROLAUNCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
 
 $(OBJDIR)/%.o: %.c config.h config.mk
 	@mkdir -p $(dir $@)
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index a7aa4243ab..eaf3fbc3af 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -23,14 +23,14 @@ add_define_make DYLIB_LIB "$DYLIB"
 [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present.
 
 [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib
-check_lib VIDEOCORE -lbcm_host bcm_host_init "-lvcos -lvchiq_arm" 
+check_lib VIDEOCORE -lbcm_host bcm_host_init "-lvcos -lvchiq_arm  -lvchostif"
 
 if [ "$HAVE_VIDEOCORE" = 'yes' ]; then
    [ -d /opt/vc/include ] && add_include_dirs /opt/vc/include
    [ -d /opt/vc/include/interface/vcos/pthreads ] && add_include_dirs /opt/vc/include/interface/vcos/pthreads
    [ -d /opt/vc/include/interface/vmcs_host/linux ] && add_include_dirs /opt/vc/include/interface/vmcs_host/linux
    HAVE_GLES='auto'
-   EXTRA_GL_LIBS="-lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
+   EXTRA_GL_LIBS="-lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lvchostif"
 fi
 
 if [ "$HAVE_NEON" = "yes" ]; then
@@ -80,7 +80,9 @@ if [ "$HAVE_EGL" != "no" ]; then
    if [ "$HAVE_EGL" = "no" ]; then
       HAVE_EGL=auto && check_lib EGL "-lEGL $EXTRA_GL_LIBS"
       [ "$HAVE_EGL" = "yes" ] && EGL_LIBS=-lEGL
-   fi
+  else
+      EGL_LIBS="$EGL_LIBS $EXTRA_GL_LIBS"
+  fi
 fi
 
 if [ "$LIBRETRO" ]; then