diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index b4b802bbb..75d1ddc95 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -31,6 +31,9 @@ ifeq ($(DEV_BUILD), y)
  ifndef DEBUG
   DEBUG		:= y
  endif
+ ifndef GDBSTUB
+  GDBSTUB	:= n
+ endif
  ifndef DEV_BRANCH
   DEV_BRANCH	:= y
  endif
@@ -92,6 +95,9 @@ else
  ifndef DEBUG
   DEBUG		:= n
  endif
+ ifndef GDBSTUB
+  GDBSTUB	:= n
+ endif
  ifndef DEV_BRANCH
   DEV_BRANCH	:= n
  endif
@@ -506,6 +512,10 @@ OPTS		+= -DUSE_OLIVETTI
 DEVBROBJ	+= olivetti_eva.o
 endif
 
+ifeq ($(GDBSTUB), y)
+OPTS		+= -DUSE_GDBSTUB
+DEVBROBJ	+= gdbstub.o
+endif
 
 endif