diff --git a/project/Build.xml b/project/Build.xml
index ea017c8fb..d3531bd0c 100755
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -238,8 +238,6 @@
 				<compilerflag value="-I/opt/vc/include" />
 				<compilerflag value="-I/opt/vc/include/interface/vcos/pthreads" />
 				<compilerflag value="-I/opt/vc/include/interface/vmcs_host/linux" />
-				<compilerflag value="-lGLESv2" />
-				<compilerflag value="-lEGL" />
 				<compilerflag value="-I/usr/include/libdrm" />
 				<compilerflag value="-I/usr/include/dbus-1.0" />
 				<compilerflag value="-I/usr/lib/arm-linux-gnueabihf/dbus-1.0/include" />
@@ -502,9 +500,11 @@
 				<lib name="-ldl" />
 				<lib name="-ldrm" />
 				<lib name="-lm" />
-				<lib name="-lbcm_host" />
 				<lib name="-lEGL" />
 				<lib name="-lGLESv2" />
+				<!-- For legacy Pi driver support -->
+				<lib name="-lbcm_host" />
+				<lib name="-L/opt/vc/lib" />
 
 			</section>