diff --git a/Makefile b/Makefile
index 826aeb8564..55893097f1 100644
--- a/Makefile
+++ b/Makefile
@@ -340,7 +340,7 @@ ifeq ($(CAPSTONE_SHARED),yes)
 ifeq ($(IS_MINGW),1)
 LIBRARY = $(BLDIR)/$(LIBNAME).$(VERSION_EXT)
 else ifeq ($(IS_CYGWIN),1)
-LIBRARY = $(BLDIR)/$(LIBNAME).$(VERSION_EXT)
+LIBRARY = $(BLDIR)/$(LIBNAME).$(EXT)
 else	# *nix
 LIBRARY = $(BLDIR)/lib$(LIBNAME).$(VERSION_EXT)
 CFLAGS += -fvisibility=hidden
diff --git a/suite/fuzz/Makefile b/suite/fuzz/Makefile
index 3370df37e5..92a733b532 100644
--- a/suite/fuzz/Makefile
+++ b/suite/fuzz/Makefile
@@ -30,11 +30,17 @@ LDFLAGS += $(foreach arch,$(LIBARCHS),-arch $(arch))
 
 LIBNAME = capstone
 
+IS_CYGWIN := $(shell $(CC) -dumpmachine 2>/dev/null | grep -i cygwin | wc -l)
+ifeq ($(IS_CYGWIN),1)
+EXT = dll
+AR_EXT = lib
+ARCHIVE = $(LIBDIR)/$(LIBNAME).$(AR_EXT)
+else
 BIN_EXT =
 AR_EXT = a
-
-
 ARCHIVE = $(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
+endif
+
 
 .PHONY: all clean