diff --git a/cpu/msp430/watchdog.c b/cpu/msp430/watchdog.c
index 4a59a37c5..75a1c8d67 100644
--- a/cpu/msp430/watchdog.c
+++ b/cpu/msp430/watchdog.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: watchdog.c,v 1.4 2008/01/21 10:39:23 adamdunkels Exp $
+ * @(#)$Id: watchdog.c,v 1.5 2008/02/11 10:45:19 adamdunkels Exp $
  */
 #include <io.h>
 #include "dev/watchdog.h"
@@ -40,6 +40,7 @@ watchdog_init(void)
 {
   /* The MSP430 watchdog is enabled at boot-up, so we stop it during
      initialization. */
+  stopped = 0;
   watchdog_stop();
 }
 /*---------------------------------------------------------------------------*/
@@ -48,8 +49,10 @@ watchdog_start(void)
 {
   /* We setup the watchdog to reset the device after one second,
      unless watchdog_periodic() is called. */
-  WDTCTL = WDTPW | WDTCNTCL | WDT_ARST_1000;
-  stopped = 0;
+  stopped--;
+  if(!stopped) {
+    WDTCTL = WDTPW | WDTCNTCL | WDT_ARST_1000;
+  }
 }
 /*---------------------------------------------------------------------------*/
 void
@@ -66,7 +69,7 @@ void
 watchdog_stop(void)
 {
   WDTCTL = WDTPW | WDTHOLD;
-  stopped = 1;
+  stopped++;
 }
 /*---------------------------------------------------------------------------*/
 void