diff --git a/Makefile b/Makefile
index 7730cdf9ba..538ef8e686 100644
--- a/Makefile
+++ b/Makefile
@@ -277,10 +277,6 @@ ifeq ($(OSARCH),SunOS)
   SOLINK=-shared -fpic -L/usr/local/ssl/lib
 endif
 
-ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  SOLINK=-Xlinker -r
-endif
-
 # This is used when generating the doxygen documentation
 ifneq ($(DOT),:)
   HAVEDOT=yes
@@ -298,7 +294,7 @@ else
 endif
 
 # comment to print directories during submakes
-PRINT_DIR:= --no-print-directory
+PRINT_DIR?= --no-print-directory
 
 all: _all
 	@echo " +--------- Asterisk Build Complete ---------+"  
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 17924be56d..54113de741 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -63,6 +63,13 @@ modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
 
 ifneq ($(LOADABLE_MODS),)
 _all: $(LOADABLE_MODS:%=%.so)
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  # linker options and extra libraries for cygwin
+  SOLINK=-Wl,--out-implib=lib$@.a -shared
+  LIBS+=-L../main -lasterisk -L../res
+  # additional libraries in res/
+  LIBS_RES:= -lres_monitor -lres_adsi -lres_features
+endif
 endif
 
 ifneq ($(EMBEDDED_MODS),)
diff --git a/main/Makefile b/main/Makefile
index 9790b5c04f..b9894e7ab4 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -87,7 +87,7 @@ endif
 
 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
   AST_LIBS+=-lminires -ldl
-  ASTLINK+= -shared -Wl,--out-implib,asterisk.dll
+  ASTLINK+= -shared -Wl,--out-implib,libasterisk.a
 endif
 ifeq ($(OSARCH),NetBSD)
   AST_LIBS+=-lpthread -lcrypto -lm -L/usr/pkg/lib $(EDITLINE_LIB)