diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..67e301db04
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Ensure Windows Git clients maintain Unix line endings on checkout
+* text eol=lf
\ No newline at end of file
diff --git a/README.md b/README.md
index ad14019d15..5476ee4f75 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,26 @@ found at:
     
 You will need a Mac or a Mac emulator (with DiscCopy) to read that file.
 
+### Windows Compilation using Cygwin
+
+You can compile Retro68 on Windows using via a Cygwin terminal. When installing
+Cygwin, select the following packages in the Cygwin Setup program (as per the dependencies 
+listed above):
+
+- bison
+- cmake
+- gcc-core
+- gcc-g++
+- libboost-devel
+- libgmp-devel
+- libmpc-devel
+- libmpfr-devel
+- make
+- zlib-devel
+
+Additional dependencies will be automatically installed.
+
+Note that compilation via Cygwin is around 3X slower than other platforms.
 
 ### Compiling Retro68
 
diff --git a/gcc/gcc/system.h b/gcc/gcc/system.h
index 0cbf60a28d..0bc8297596 100644
--- a/gcc/gcc/system.h
+++ b/gcc/gcc/system.h
@@ -145,7 +145,7 @@ extern int fgetc_unlocked (FILE *);
 extern char *fgets_unlocked (char *, int, FILE *);
 #  endif
 # endif
-# ifdef HAVE_FPUTS_UNLOCKED
+# if defined (HAVE_FPUTS_UNLOCKED) && !defined (__CYGWIN__)
 #  undef fputs
 #  define fputs(String, Stream) fputs_unlocked (String, Stream)
 #  if defined (HAVE_DECL_FPUTS_UNLOCKED) && !HAVE_DECL_FPUTS_UNLOCKED