diff --git a/Makefile-ARM b/Makefile-ARM
index a38aa16..9abc13f 100644
--- a/Makefile-ARM
+++ b/Makefile-ARM
@@ -101,9 +101,9 @@ SOURCES  = mendel.c cpu.c serial.c sermsg.c sersendf.c delay.c
 SOURCES += gcode_parse.c gcode_process.c pinio.c timer.c clock.c
 SOURCES += dda_queue.c dda_maths.c dda_kinematics.c dda.c dda_lookahead.c
 SOURCES += analog.c temp.c heater.c home.c debug.c crc.c pff.c pff_diskio.c
-SOURCES += spi.c intercom.c graycode.c usb_serial.c
+SOURCES += spi.c intercom.c graycode.c usb_serial.c watchdog.c
 # Sources left:
-# watchdog.c
+#
 
 ifeq ($(MCU), lpc1114)
   SOURCES += cmsis-system_lpc11xx.c
diff --git a/gcode_process.c b/gcode_process.c
index b464ecc..8addb87 100644
--- a/gcode_process.c
+++ b/gcode_process.c
@@ -593,10 +593,8 @@ void process_gcode_command() {
         queue_flush();
         power_off();
         cli();
-        #ifndef __ARMEL_NOTYET__
         for (;;)
           wd_reset();
-        #endif /* __ARMEL_NOTYET__ */
         break;
 
 			case 114:
diff --git a/watchdog.h b/watchdog.h
index f03ab16..95883d4 100644
--- a/watchdog.h
+++ b/watchdog.h
@@ -5,6 +5,13 @@
 
 #ifdef USE_WATCHDOG
 
+/**
+  Test configuration.
+*/
+#ifdef __ARMEL__
+  #error Watchdog (USE_WATCHDOG) not yet supported on ARM.
+#endif
+
 // initialize
 void wd_init(void) __attribute__ ((cold));