diff --git a/Makefile b/Makefile
index 9334e7d..2879015 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
 
 lib/$(LIB.SHARED): $(LIB.SOBJS)
 	$(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
-ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
+ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
 else
 	$(LN) $(LIB.SHARED) lib/$(LIB.SONAME)
 	$(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK)
@@ -127,7 +127,7 @@ install: all
 	$(INSTALL) -d -m 0755 $(LIBDIR)
 	$(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig
 # runtime
-ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
+ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
 	$(STRIP) -x lib/$(LIB.SHARED)
 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
 else
@@ -140,7 +140,7 @@ endif
 	$(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/
 	$(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/
 	$(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/
-ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
+ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
 	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
 else
 	$(STRIP) -x lib/$(LIB.STATIC)
@@ -155,7 +155,7 @@ uninstall:
 	$(RM) $(INCDIR)/glew.h
 	$(RM) $(INCDIR)/glxew.h
 	$(RM) $(LIBDIR)/$(LIB.DEVLNK)
-ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
+ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
 	$(RM) $(BINDIR)/$(LIB.SHARED)
 else
 	$(RM) $(LIBDIR)/$(LIB.SONAME)
diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin
index c724e42..9fbab8b 100644
--- a/config/Makefile.cygwin
+++ b/config/Makefile.cygwin
@@ -6,7 +6,7 @@ LD = cc
 ifneq (undefined, $(origin GLEW_MX))
 CFLAGS.EXTRA = -DGLEW_MX
 endif
-LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
+LDFLAGS.SO = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK)
 LDFLAGS.EXTRA = -L/usr/X11R6/lib
 LIBDIR = $(GLEW_DEST)/lib
 LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
@@ -14,8 +14,8 @@ LDFLAGS.STATIC = -Wl,-Bstatic
 LDFLAGS.DYNAMIC = -Wl,-Bdynamic
 WARN = -Wall -W
 POPT = -O2
-BIN.SUFFIX =
-LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
-LIB.DEVLNK = lib$(NAME).so
-LIB.SHARED = lib$(NAME).so.$(SO_VERSION)
+BIN.SUFFIX = .exe
+LIB.SONAME = cyg$(NAME)-$(SO_MAJOR).dll
+LIB.DEVLNK = lib$(NAME).dll.a
+LIB.SHARED = cyg$(NAME)-$(SO_MAJOR).dll
 LIB.STATIC = lib$(NAME).a