diff --git a/.travis.yml b/.travis.yml
index d9bede5..f81b2eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,3 +3,17 @@ script: make
 compiler:
   - clang
   - gcc
+
+matrix:
+  include:
+    - name: "Raspberry-cross"
+      language: c
+      compiler: gcc
+      before_install:
+        - pushd /tmp
+        - wget https://github.com/raspberrypi/tools/archive/master.tar.gz -O raspi-tools.tar.gz
+        - tar xzf raspi-tools.tar.gz
+        - wget https://github.com/raspberrypi/firmware/archive/master.tar.gz -O raspi-firmware.tar.gz
+        - tar xzf raspi-firmware.tar.gz
+        - popd
+      script: make RASPBERRY=1 CROSS=1 RPI_TOOLS=/tmp/tools-master RPI_VCDIR=/tmp/firmware-master/hardfp/opt/vc
diff --git a/Makefile b/Makefile
index 0d2608c..b23552f 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ ifeq ($(RASPBERRY), 1)
 
 	CFLAGS += -I$(RPI_VCDIR)/include -I$(RPI_VCDIR)/include/interface/vcos/pthreads
 	CFLAGS += -I$(RPI_VCDIR)/include/interface/vmcs_host/linux -DATTO_PLATFORM_RPI
-	LIBS += -lGLESv2 -lEGL -lbcm_host -lvcos -lvchiq_arm -L$(RPI_VCDIR)/lib -lrt -lm
+	LIBS += -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lvcos -lvchiq_arm -L$(RPI_VCDIR)/lib -lrt -lm
 
 	SOURCES += \
 		src/etcpack.c \