diff --git a/GNUmakef.def b/GNUmakef.def
index 62eef19..10180af 100644
--- a/GNUmakef.def
+++ b/GNUmakef.def
@@ -45,6 +45,19 @@ EXEEXT=.exe
 OBJEXT=.o
 LIBEXT=.a
 else
+ifeq ($(TERM),MSYS)
+CAT=cat
+CC=gcc
+CXX=g++
+AR=ar
+RANLIB=ranlib
+WINDRES=windres
+PLATFORM=cyg
+SHELL=bash
+EXEEXT=.exe
+OBJEXT=.o
+LIBEXT=.a
+else
 ifeq ($(OSTYPE),beos) # BeOS build
 CAT=cat
 CC=gcc
@@ -73,6 +86,7 @@ endif
 endif
 endif
 endif
+endif
 CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DPRAGMA_PACK # -fomit-frame-pointer
 LNKFLAGS+=-g
 CPPFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti
diff --git a/golded3/Makefile b/golded3/Makefile
index 70e1212..d3db8a0 100644
--- a/golded3/Makefile
+++ b/golded3/Makefile
@@ -13,6 +13,11 @@ else
 ifeq ($(TERM),cygwin)
 STDLIBS=-luser32 -lwinmm
 GLIBS+=glibc
+else
+ifeq ($(TERM),MSYS)
+STDLIBS=-luser32 -lwinmm
+GLIBS+=glibc
+endif
 endif
 endif
 
diff --git a/goldlib/gall/Makefile b/goldlib/gall/Makefile
index aee4c79..1fcc960 100644
--- a/goldlib/gall/Makefile
+++ b/goldlib/gall/Makefile
@@ -8,6 +8,10 @@ INCS+=-I$(TOP)/goldlib/glibc
 else
 ifeq ($(TERM),cygwin)
 INCS+=-I$(TOP)/goldlib/glibc
+else
+ifeq ($(TERM),MSYS)
+INCS+=-I$(TOP)/goldlib/glibc
+endif
 endif
 endif
 
diff --git a/goldnode/Makefile b/goldnode/Makefile
index 3365327..f0ef247 100644
--- a/goldnode/Makefile
+++ b/goldnode/Makefile
@@ -6,9 +6,14 @@ TARGET=goldnode
 INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/golded3/
 ifeq ($(findstring EMX, $(PATH)), EMX)
 STDLIBS=-lstdcpp
-endif
+else
 ifeq ($(TERM),cygwin)
 STDLIBS=-luser32
+else
+ifeq ($(TERM),MSYS)
+STDLIBS=-luser32
+endif
+endif
 endif
 GLIBS=gall
 CLEANS=
diff --git a/rddt/Makefile b/rddt/Makefile
index 92ab0e7..b96f984 100644
--- a/rddt/Makefile
+++ b/rddt/Makefile
@@ -6,9 +6,14 @@ TARGET=rddt
 INCS=-I$(TOP)/goldlib/gall
 ifeq ($(findstring EMX, $(PATH)), EMX)
 STDLIBS=-lstdcpp
-endif
+else
 ifeq ($(TERM),cygwin)
 STDLIBS=-luser32
+else
+ifeq ($(TERM),MSYS)
+STDLIBS=-luser32
+endif
+endif
 endif
 GLIBS=gall
 CLEANS=