diff --git a/cpu/cc2538/dev/watchdog.c b/cpu/cc2538/dev/watchdog.c
index 7d446e74e..985f0f633 100644
--- a/cpu/cc2538/dev/watchdog.c
+++ b/cpu/cc2538/dev/watchdog.c
@@ -87,6 +87,7 @@ void
 watchdog_reboot(void)
 {
   INTERRUPTS_DISABLE();
+  watchdog_start(); /* just in case the WDT hasn't been started yet */
   while(1);
 }
 /**
diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index 2d87e222c..018f0ccb3 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -50,6 +50,16 @@ typedef uint32_t rtimer_clock_t;
 #endif
 /** @} */
 /*---------------------------------------------------------------------------*/
+/**
+ * \name Watchdog Timer configuration
+ *
+ * @{
+ */
+#ifndef WATCHDOG_CONF_ENABLE
+#define WATCHDOG_CONF_ENABLE	1 /**<Enable the watchdog timer */
+#endif
+/** @} */
+/*---------------------------------------------------------------------------*/
 /**
  * \name USB 'core' configuration
  *
diff --git a/platform/cc2538dk/contiki-main.c b/platform/cc2538dk/contiki-main.c
index 93d10bc8a..633aa59f9 100644
--- a/platform/cc2538dk/contiki-main.c
+++ b/platform/cc2538dk/contiki-main.c
@@ -203,7 +203,9 @@ main(void)
 
   autostart_start(autostart_processes);
 
+#if WATCHDOG_CONF_ENABLE
   watchdog_start();
+#endif
   fade(LEDS_ORANGE);
 
   while(1) {