diff --git a/boards/iot-lab_M3/Makefile.include b/boards/iot-lab_M3/Makefile.include
index d2116377ba..94cbba42da 100644
--- a/boards/iot-lab_M3/Makefile.include
+++ b/boards/iot-lab_M3/Makefile.include
@@ -29,7 +29,7 @@ export LINKFLAGS += -ggdb -g3 -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endi
 export LINKFLAGS += -T$(LINKERSCRIPT)
 export OFLAGS = -O ihex
 export FFLAGS = $(HEXFILE)
-export DEBUGGER_FLAGS = $(ELFFILE)
+export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)
 
 # use the nano-specs of the NewLib when available
 ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
diff --git a/boards/iot-lab_M3/dist/debug.sh b/boards/iot-lab_M3/dist/debug.sh
index 3195d5ef78..ecce45901b 100755
--- a/boards/iot-lab_M3/dist/debug.sh
+++ b/boards/iot-lab_M3/dist/debug.sh
@@ -9,9 +9,17 @@ fi
 BIN_FOLDER=$(dirname "${FILE}")
 
 openocd -f "${BIN_FOLDER}/${BOARD}_jtag.cfg" \
-	-f "target/stm32f1x.cfg" \
-	-c "tcl_port 6333" \
-	-c "telnet_port 4444" \
-	-c "init" \
-	-c "targets" \
-	-c "reset halt"
+    -f "target/stm32f1x.cfg" \
+    -c "tcl_port 6333" \
+    -c "telnet_port 4444" \
+    -c "init" \
+    -c "targets" \
+    -c "reset halt" \
+    -l /dev/null &
+
+# needed for openocd to set up
+sleep 5
+
+arm-none-eabi-gdb -tui --command=${1} ${2}
+
+killall openocd
diff --git a/boards/iot-lab_M3/dist/gdb.conf b/boards/iot-lab_M3/dist/gdb.conf
new file mode 100644
index 0000000000..45fceb2df7
--- /dev/null
+++ b/boards/iot-lab_M3/dist/gdb.conf
@@ -0,0 +1,3 @@
+target remote localhost:3333
+monitor reset halt
+load