diff --git a/.travis.yml b/.travis.yml
index 77431b24..02319c75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,15 +4,11 @@ sudo: required
 os:
   - linux
 before_install:
-  - pushd ..
   - wget http://downloads.arduino.cc/arduino-1.6.11-linux64.tar.xz
   - tar xf arduino-1.6.11-linux64.tar.xz
-  - popd
 install:
   - git clone --recurse-submodules https://github.com/keyboardio/Arduino-Boards hardware/keyboardio/avr
 script:
-  - export DEFAULT_SKETCH=$(cd examples; basename *)
-  - export ARDUINO_PATH=$(pwd)/../arduino-1.6.11
+  - export ARDUINO_PATH=$(pwd)/arduino-1.6.11
   - export BOARD_HARDWARE_PATH=$(pwd)/hardware
-  - export EXTRA_BUILDER_ARGS="-libraries ."
-  - hardware/keyboardio/avr/libraries/Kaleidoscope/tools/kaleidoscope-builder build
+  - make build-all
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..b028065c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+# This stub makefile for a Kaleidoscope plugin pulls in 
+# all targets from the Kaleidoscope-Plugin library
+
+UNAME_S := $(shell uname -s)
+
+BOARD_HARDWARE_PATH ?= $(HOME)/Arduino/hardware
+ifeq ($(UNAME_S),Darwin)
+BOARD_HARDWARE_PATH ?= $(HOME)/Library/Arduino/hardware
+endif
+
+include $(BOARD_HARDWARE_PATH)/keyboardio/avr/libraries/Kaleidoscope-Plugin/build/*.mk