diff --git a/aos/build/aos.gypi b/aos/build/aos.gypi
index b04db8d..3ae06b4 100644
--- a/aos/build/aos.gypi
+++ b/aos/build/aos.gypi
@@ -36,7 +36,6 @@
           'platflags': [
             '-target', 'armv7a-linux-gnueabihf',
             '-mfloat-abi=hard',
-            '-ccc-gcc-name', 'arm-linux-gnueabihf-gcc',
             '--sysroot=<(arm-clang-sysroot)',
 
             #-mhwdiv=arm,thumb
@@ -48,10 +47,12 @@
         ],
         'target_defaults': {
           'cflags': [
-            '-I<!(realpath -s <(arm-clang-sysroot)/usr/include/c++/4.7.2/)',
-            '-I<!(realpath -s <(arm-clang-sysroot)/usr/include/c++/4.7.2/arm-linux-gnueabihf/)',
             '<@(platflags)',
           ],
+          'cflags_cc': [
+            '-isystem', '<(arm-clang-sysroot)/usr/include/c++/4.7.2',
+            '-isystem', '<(arm-clang-sysroot)/usr/include/c++/4.7.2/arm-linux-gnueabihf',
+          ],
           'ldflags': [
             '<@(platflags)',
           ],
diff --git a/aos/build/arm-clang-symlinks/bin/clang b/aos/build/arm-clang-symlinks/bin/clang
index c456250..6e5b0eb 120000
--- a/aos/build/arm-clang-symlinks/bin/clang
+++ b/aos/build/arm-clang-symlinks/bin/clang
@@ -1 +1 @@
-/usr/bin/clang
\ No newline at end of file
+/opt/clang-3.5/bin/clang
\ No newline at end of file
diff --git a/aos/build/arm-clang-symlinks/bin/clang++ b/aos/build/arm-clang-symlinks/bin/clang++
index 2932265..3237b82 120000
--- a/aos/build/arm-clang-symlinks/bin/clang++
+++ b/aos/build/arm-clang-symlinks/bin/clang++
@@ -1 +1 @@
-/usr/bin/clang++
\ No newline at end of file
+/opt/clang-3.5/bin/clang++
\ No newline at end of file
diff --git a/doc/clang-3.5.ctl b/doc/clang-3.5.ctl
new file mode 100644
index 0000000..dfbae3e
--- /dev/null
+++ b/doc/clang-3.5.ctl
@@ -0,0 +1,28 @@
+# This is a control file for creating the clang-3.5 package.
+### Commented entries have reasonable defaults.
+### Uncomment to edit them.
+Source: llvm-toolchain-snapshot
+Section: misc
+Priority: optional
+Homepage: http://www.llvm.org/
+Standards-Version: 3.9.2
+
+Package: clang-3.5
+Version: 1:3.5~svn201561
+Maintainer: FRC Team 971 <spartanrobotics.org>
+# Pre-Depends: <comma-separated list of packages>
+Depends: libbsd0, libc6, libedit2, libncurses5, libpython2.7, libtinfo5, zlib1g
+# Recommends: <comma-separated list of packages>
+# Suggests: <comma-separated list of packages>
+# Provides: <comma-separated list of packages>
+# Replaces: <comma-separated list of packages>
+Architecture: amd64
+# Copyright: <copyright file; defaults to GPL2>
+# Changelog: <changelog file; defaults to a generic changelog>
+# Readme: <README.Debian file; defaults to a generic one>
+# Extra-Files: <comma-separated list of additional files for the doc directory>
+# Files: /opt/clang-3.5/ /opt/
+#  <more pairs, if there's more than one file to include. Notice the starting space>
+Description: Clang 3.5 with included GCC 4.8 so it actually works.
+ This is just 1 massive package with a newer clang that doesn't conflict with
+ other stuff like the official clang-3.5 package does.