diff --git a/Makefile.common b/Makefile.common
index 6b79aae1..3364cdbc 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -36,6 +36,9 @@ endif
 
 ifneq ($(DEBUG), 1)
   CPPFLAGS += -DNDEBUG
+  WATCHDOG ?= 1
+else
+  WATCHDOG ?= 0
 endif
 
 TOPDIR := $(CURDIR)
@@ -133,6 +136,10 @@ CXXFLAGS += $(OLVL)
 CPPFLAGS += -D__TARGET_$(call uppercase,$(TARGET_FAMILY))
 CPPFLAGS += -D__CPU_$(call uppercase,$(TARGET_SUBFAMILY))
 
+ifneq ($(WATCHDOG), 0)
+  CPPFLAGS += -DWATCHDOG
+endif
+
 #
 # Generic rules
 #