diff --git a/Robot2016/Makefile b/Robot2016/Makefile
index 4584c5a..99c08a2 100644
--- a/Robot2016/Makefile
+++ b/Robot2016/Makefile
@@ -1,5 +1,7 @@
 LIBS=wpi
-override CFLAGS +=-l$(LIBS) -std=c++14
+CXX=arm-frc-linux-gnueabi-g++
+override CPPFLAGS +=-std=c++14
+LDFLAGS=-l$(LIBS)
 TEAM=1786
 SSH_OPTIONS=-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no
 SSH_SSHPASS=$(shell command -v sshpass >/dev/null 2>&1 && echo -n "sshpass -p ''")
@@ -8,9 +10,9 @@ all: deploy
 
 build: FRCUserProgram
 
-FRCUserProgram: robot.cpp
+FRCUserProgram: src/Robot.cpp
 	@echo "Building FRCUserProgram"
-	arm-frc-linux-gnueabi-g++ robot.cpp -o FRCUserProgram $(CFLAGS)
+	$(CXX) $(CPPFLAGS) $< -o $@ $(LDFLAGS)
 
 clean:
 	rm FRCUserProgram