diff --git a/debug/openocd/samd21.cfg b/debug/openocd/samd21.cfg
index 6b4a886c..84c41d30 100644
--- a/debug/openocd/samd21.cfg
+++ b/debug/openocd/samd21.cfg
@@ -22,6 +22,6 @@ source [find interface/cmsis-dap.cfg]
 transport select swd
 
 # chip name
-#set CHIPNAME at91samd21g18
+set CHIPNAME samd21
 
 source [find target/at91samdXX.cfg]
diff --git a/debug/openocd/samd51.cfg b/debug/openocd/samd51.cfg
new file mode 100644
index 00000000..c9ad3204
--- /dev/null
+++ b/debug/openocd/samd51.cfg
@@ -0,0 +1,29 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#  See the GNU Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+source [find interface/cmsis-dap.cfg]
+#source [find interface/jlink.cfg]
+transport select swd
+
+# chip name
+set CHIPNAME samd51
+
+source [find target/atsame5x.cfg]
+adapter speed 500
diff --git a/platform.txt b/platform.txt
index dd5f1de3..b1aacae5 100644
--- a/platform.txt
+++ b/platform.txt
@@ -234,6 +234,7 @@ debug.toolchain.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
 debug.toolchain.prefix=arm-none-eabi-
 debug.server=openocd
 debug.server.openocd.path={runtime.tools.openocd.path}/bin/openocd
+#debug.server.openocd.path=/usr/local/bin/openocd
 debug.server.openocd.scripts_dir={runtime.tools.openocd.path}/share/openocd/scripts/
 debug.server.openocd.script={runtime.platform.path}/{build.openocdscript}