diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83eb8bf8..d1e604e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ endif (WIN32)
 #--------------------------------------------------------------------
 # Set up GLFW for Xlib and GLX on Unix-like systems with X Windows
 #--------------------------------------------------------------------
-if (UNIX AND NOT APPLE AND NOT CYGWIN)
+if (UNIX AND NOT APPLE)
     message(STATUS "Building GLFW for X11 and GLX on a Unix-like system")
 
     # Define the platform identifier
@@ -92,7 +92,7 @@ if (UNIX AND NOT APPLE AND NOT CYGWIN)
     if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
         set(_GLFW_USE_LINUX_JOYSTICKS 1)
     endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-endif(UNIX AND NOT APPLE AND NOT CYGWIN)
+endif(UNIX AND NOT APPLE)
 
 #--------------------------------------------------------------------
 # Set up GLFW for Cocoa and NSOpenGL on Mac OS X
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 345631cc..d511b22d 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -32,10 +32,3 @@ if(MSVC)
                         LINK_FLAGS "/ENTRY:mainCRTStartup")
 endif(MSVC)
 
-if(CYGWIN)
-  # Set cross-compile and subsystem compile and link flags
-  set_target_properties(${WINDOWS_BINARIES} PROPERTIES
-                        COMPILE_FLAGS "-mno-cygwin"
-                        LINK_FLAGS "-mno-cygwin -mwindows")
-endif(CYGWIN)
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd50b41d..f15089e9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,16 +1,4 @@
 
-if(CYGWIN)
-
-    # These lines are intended to remove the --export-all-symbols
-    # flag added in the Modules/Platform/CYGWIN.cmake file of the
-    # CMake distribution.
-    # This is a HACK.  If you have trouble _linking_ the GLFW
-    # _shared_ library on Cygwin, try disabling this.
-    set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
-    set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
-
-endif(CYGWIN)
-
 if(UNIX)
     if(_GLFW_HAS_XRANDR)
         set(GLFW_PKGLIBS "${GLFW_PKGLIBS} xrandr")
@@ -67,13 +55,6 @@ if(WIN32)
                           IMPORT_SUFFIX "dll.lib")
 endif(WIN32)
 
-if(CYGWIN)
-    # Build for the regular Win32 environment (not Cygwin)
-    set_target_properties(libglfwStatic libglfwShared PROPERTIES
-                          COMPILE_FLAGS "-mwin32 -mno-cygwin"
-                          LINK_FLAGS "-mwin32 -mno-cygwin")
-endif(CYGWIN)
-
 if(APPLE)
     # Append -fno-common to the compile flags to work around a bug in the Apple GCC
     get_target_property(CFLAGS libglfwShared COMPILE_FLAGS)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 81ba0dd6..5adbf351 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -64,13 +64,3 @@ if(MSVC)
                         LINK_FLAGS "/ENTRY:mainCRTStartup")
 endif(MSVC)
 
-if(CYGWIN)
-  # Set cross-compile and subsystem compile and link flags
-  set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} PROPERTIES
-                        COMPILE_FLAGS "-mno-cygwin")
-  set_target_properties(${WINDOWS_BINARIES} PROPERTIES
-                        LINK_FLAGS "-mno-cygwin -mwindows")
-  set_target_properties(${CONSOLE_BINARIES} PROPERTIES
-                        LINK_FLAGS "-mno-cygwin -mconsole")
-endif(CYGWIN)
-
diff --git a/tests/dynamic.c b/tests/dynamic.c
old mode 100755
new mode 100644