diff --git a/configure.ac b/configure.ac
index bc69e73..a6813d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,14 @@ if test x$BOXTYPE = xgeneric; then
 		PKG_CHECK_MODULES([SWSCALE], [libswscale])
 		PKG_CHECK_MODULES([SWRESAMPLE], [libswresample])
 	else
+		# egl are the broadcom userspace libs
+		# e.g. yocto (openembedded) has a egl package built from userland git.
+		# Use that if available. If not, just fall back to /opt/vc/...
+		PKG_CHECK_MODULES([EGL], [egl], echo "EGL userspace package found. Good.",
+			[ echo "EGL package not found, assuming /opt/vc/..."
+			  EGL_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads/ -I/opt/vc/include/interface/vmcs_host/linux"
+			  EGL_LIBS="-L/opt/vc/lib/ -lopenmaxil -lbcm_host -lvcos -lvchiq_arm"
+			])
 		# raspbian has no current versions and only libav instead of ffmpeg... :-(
 		PKG_CHECK_MODULES([AVFORMAT], [libavformat])
 		PKG_CHECK_MODULES([AVCODEC], [libavcodec])
diff --git a/raspi/Makefile.am b/raspi/Makefile.am
index d8763a6..53906e9 100644
--- a/raspi/Makefile.am
+++ b/raspi/Makefile.am
@@ -3,9 +3,7 @@ noinst_LTLIBRARIES = libraspi.la
 AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
 AM_CPPFLAGS += -DUSE_VCHIQ_ARM -DOMX -DOMX_SKIP64BIT -DUSE_EXTERNAL_OMX -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST
 AM_CPPFLAGS += \
-	-I/opt/vc/include \
-	-I/opt/vc/include/interface/vcos/pthreads/ \
-	-I/opt/vc/include/interface/vmcs_host/linux \
+	@EGL_CFLAGS@ \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/common
 
@@ -15,7 +13,7 @@ AM_LDFLAGS = \
 	@AVFORMAT_LIBS@ \
 	@AVUTIL_LIBS@ \
 	@AVCODEC_LIBS@ \
-	-L/opt/vc/lib/ -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt \
+	@EGL_LIBS@ \
 	-lOpenThreads
 
 libraspi_la_SOURCES = \