diff --git a/build/build.xml b/build/build.xml
index 89cfbb70c..ef69a77c4 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -395,6 +395,8 @@
     <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
     <chmod perm="755" file="linux/work/hardware/tools/bossac" />
     <chmod perm="755" file="linux/work/hardware/tools/bossac64" />
+    <chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
+    <chmod perm="755" file="linux/work/hardware/tools/adk2install" />
 
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
diff --git a/hardware/arduino/sam/boards.txt b/hardware/arduino/sam/boards.txt
index aa2ffe3b8..ca415eaf6 100644
--- a/hardware/arduino/sam/boards.txt
+++ b/hardware/arduino/sam/boards.txt
@@ -33,7 +33,7 @@ arduino_due_x.build.pid=0x003e
 ##############################################################
 
 adk2.name=Google ADK2
-adk2.upload.tool=bossac
+adk2.upload.tool=adk2install
 adk2.upload.protocol=sam-ba
 adk2.upload.maximum_size=49152
 adk2.build.mcu=cortex-m3
diff --git a/hardware/arduino/sam/platform.txt b/hardware/arduino/sam/platform.txt
index 9dcb5a44c..e928040c7 100644
--- a/hardware/arduino/sam/platform.txt
+++ b/hardware/arduino/sam/platform.txt
@@ -61,3 +61,13 @@ tools.bossac.upload.params.verbose=-i -d
 tools.bossac.upload.params.quiet=
 tools.bossac.upload.pattern={path}/{cmd} {upload.verbose} --port={serial.port.file} -e -w -v -b {build.path}/{build.project_name}.bin
 
+# specialized tool for adk2 to twiddle the erase line before running bossac
+tools.adk2install.cmd=adk2install
+tools.adk2install.cmd.windows=bossac.exe
+tools.adk2install.path={runtime.ide.path}/hardware/tools
+
+tools.adk2install.upload.params.verbose=
+tools.adk2install.upload.params.quiet=
+tools.adk2install.upload.pattern={path}/{cmd} {path}/adk2tool {serial.port.file} {path}/bossac {build.path}/{build.project_name}.bin
+
+