diff --git a/arm-toolchain.cmake b/arm-toolchain.cmake
index c660be3737..7b5d1ffd60 100644
--- a/arm-toolchain.cmake
+++ b/arm-toolchain.cmake
@@ -1,10 +1,12 @@
 cmake_minimum_required(VERSION 2.8)
 INCLUDE(CMakeForceCompiler)
 set(ARM_PREFIX arm-none-linux-gnueabi)
+#set(ARM_PREFIX arm-frc-linux-gnueabi)
 set(CMAKE_SYSTEM_NAME Linux)
 CMAKE_FORCE_CXX_COMPILER(${ARM_PREFIX}-g++ GNU)
 CMAKE_FORCE_C_COMPILER(${ARM_PREFIX}-gcc GNU)
 set(CMAKE_CXX_FLAGS "-march=armv7-a -mcpu=cortex-a9 -mfloat-abi=softfp -Wall -Wno-psabi" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g" CACHE STRING "" FORCE) # still want debugging for release?
+#SET(CMAKE_FIND_ROOT_PATH /usr/arm-frc-linux-gnueabi)
 SET(CMAKE_FIND_ROOT_PATH $ENV{USER_HOME}/wpilib/toolchains/arm-none-linux-gnueabi-4.4.1/arm-none-linux-gnueabi/libc)
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/feature.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/feature.xml
index b821128fdb..442deaf4c3 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/feature.xml
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature"
       label="Windows Toolchain for Robot C++ Development"
-      version="0.2.0"
+      version="0.3.0"
       provider-name="Worcester Polytechnic Institute"
       os="win32">
 
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/pom.xml
index 66bd52cbd2..6e98e250c6 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/pom.xml
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature</artifactId>
-  <version>0.2.0</version>
+  <version>0.3.0</version>
   <packaging>eclipse-feature</packaging>
 
   <parent>
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/META-INF/MANIFEST.MF b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/META-INF/MANIFEST.MF
index 743c3cfbec..a121c67513 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/META-INF/MANIFEST.MF
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Windows
 Bundle-SymbolicName: edu.wpi.first.wpilib.plugins.cpp.toolchains.windows;singleton:=true
-Bundle-Version: 0.2.0
+Bundle-Version: 0.3.0
 Bundle-Activator: edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/pom.xml
index 15767e5cac..7fa5f4b062 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/pom.xml
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>edu.wpi.first.wpilib.plugins.cpp.toolchains.windows</artifactId>
-  <version>0.2.0</version>
+  <version>0.3.0</version>
   <packaging>eclipse-plugin</packaging>
 
   <parent>
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/site.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/site.xml
index 84fffa1893..1f54c278c1 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/site.xml
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/site.xml
@@ -12,7 +12,7 @@
    <feature url="features/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature_0.2.0.jar" id="edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature" version="0.2.0">
       <category name="edu.wpi.first.wpilib.plugins.cpp.toolchains"/>
    </feature>
-   <feature url="features/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature_0.2.0.jar" id="edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature" version="0.2.0">
+   <feature url="features/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature_0.3.0.jar" id="edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature" version="0.3.0">
       <category name="edu.wpi.first.wpilib.plugins.cpp.toolchains"/>
    </feature>
    <category-def name="edu.wpi.first.wpilib.plugins" label="WPILib Robot Development">