diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 29106682fb..af037b4cd6 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -941,7 +941,7 @@
 
 <UL>
   <LI>download ready-to-use font packages from MPlayer site.
-    Note: currently available fonts are limited for iso 8859-1/2 support,
+    Note: Currently available fonts are limited for iso 8859-1/2 support,
     but there are some other (including Korean, Russian, 8859-8 etc) fonts
     at contrib/font section of FTP, made by users.<BR>
     <BR>
@@ -1750,27 +1750,24 @@ end
 
 <H2><A NAME="cygwin">6.7 Cygwin</A></H2>
 
-<P>The Cygwin port is still in its infancy and could use some love,
-  <A HREF="tech/patches.txt">patches</A> are always welcome. You should also
-  check out the
+<P>The Cygwin port is still in its infancy. Currently there is no support for
+  Win32 DLLs, VCDs or OpenGL. SDL is known to distort sound and image or crash
+  on some systems. <A HREF="tech/patches.txt">Patches</A> are always welcome.
+  Best results are achieved with the native DirectX video output driver
+  (<CODE>-vo directx</CODE>) and the native Windows waveout audio driver
+  (<CODE>-ao win32</CODE>). You should also check out the
   <A HREF="http://mplayerhq.hu/mailman/listinfo/mplayer-cygwin/">mplayer-cygwin</A>
   mailing list for help and latest information.</P>
 
-<P>To get native DirectX video (<CODE>-vo directx</CODE>), extract the
-  <A HREF="http://www.videolan.org/vlc/dx7headers.tgz">DirectX 7 header files</A>
-  into <CODE>/usr/include/<CODE> or <CODE>/usr/local/include/<CODE> and
-  recompile. This, together with <CODE>-ao win32</CODE> should give you best
-  results. If the image is distorted, try turning off hardware acceleration with
-  <CODE>-vo directx:noaccel</CODE>.</P>
+<P>You have to copy or symlink <CODE>etc/cygwin_inttypes.h</CODE> from the
+  MPlayer source directory to <CODE>/usr/include/inttypes.h</CODE> in order to
+  make MPlayer compile.</P>
 
-<P>You will have to go to the MPlayer directory, and copy or symlink
-  <CODE>etc/cygwin_inttypes.h</CODE> to <CODE>/usr/include/inttypes.h</CODE> to
-  make MPlayer compile. Otherwise it will complain about missing
-  <CODE>inttypes.h</CODE>.</P>
-
-<P>Since there is no support for Win32 DLLs under Cygwin and OpenGL and mpdvdkit
-  do not work/compile, you should disable them in configure with
-  <CODE>./configure --disable-win32 --disable-gl --disable-mpdvdkit</CODE>.</P>
+<P>To get native DirectX video, download
+  <A HREF="http://www.videolan.org/vlc/dx7headers.tgz">DirectX 7 header files</A>,
+  extract them to <CODE>/usr/include/</CODE> or <CODE>/usr/local/include/</CODE>
+  and recompile. If the image is distorted, try turning off hardware
+  acceleration with <CODE>-vo directx:noaccel</CODE>.</P>
 
 <P>Instructions and files for making SDL run under Cygwin can be found on the
   <A HREF="http://www.libsdl.org/extras/win32/cygwin/">libsdl site</A>.</P>
diff --git a/configure b/configure
index d0e58cf62d..50ac88df55 100755
--- a/configure
+++ b/configure
@@ -214,7 +214,7 @@ Audio output:
   --disable-esd          disable esd sound support [autodetect]
   --disable-alsa         disable alsa sound support [autodetect]
   --disable-sunaudio     disable Sun sound support [autodetect]
-  --disable-win32waveout disable windows waveout sound support [autodetect]
+  --disable-win32waveout disable Windows waveout sound support [autodetect]
   --disable-select       disable using select() on audio device [enable]
 
 Miscellaneous options:
@@ -2548,6 +2548,7 @@ fi
 
 
 echocheck "OpenGL"
+cygwin && _gl=no
 #Note: this test is run even with --enable-gl since we autodetect $_ld_gl
 if test "$_x11" = yes && test "$_gl" != no ; then
   cat > $TMPC << EOF
@@ -3007,7 +3008,7 @@ else
   echores "no"
 fi
 
-echocheck "windows waveout"
+echocheck "Windows waveout"
 if test "$_win32waveout" = auto ; then
   cat > $TMPC << EOF
 #include <windows.h>
@@ -3737,6 +3738,7 @@ echores "$_faad"
 
 echocheck "Win32 DLL support"
 qnx && _win32=no
+cygwin && _win32="Win32 DLLs not supported under Cygwin"
 if test "$_win32" = auto ; then
   _win32=no
   if x86 ; then
@@ -3764,7 +3766,7 @@ else
   _def_win32='#undef USE_WIN32DLL'
   _nocodecmodules="win32 $_nocodecmodules"
   _dshow=no
-  echores "no"
+  echores "$_win32"
 fi
 
 
@@ -5398,12 +5400,12 @@ Use --enable-sdl to force usage of libSDL.
 EOF
 fi
 
-if x86 ; then
+if x86 && ! cygwin; then
   if test "$_win32" = no ; then
     if test "$_win32libdir" ; then
       cat <<EOF
-Failed to find a WIN32 codecs dir at $_win32libdir!
-Create it and copy the DLL files there! (You can get them from your windows
+Failed to find a Win32 codecs dir at $_win32libdir!
+Create it and copy the DLL files there! (You can get them from your Windows
 directory or download them from:
   ftp://ftp.MPlayerHQ.hu/MPlayer/releases/w32codec.tar.bz2
 
@@ -5415,7 +5417,7 @@ EOF
       :
     else
       cat <<EOF
-Failed to find a WIN32 codecs directory!
+Failed to find a Win32 codecs directory!
 Create it and copy the DLL files there! (You can get them from your Windows
 directory or download them from:
   ftp://ftp.MPlayerHQ.hu/MPlayer/releases/w32codec.tar.bz2
@@ -5425,9 +5427,10 @@ EOF
   fi
 else
   cat <<EOF
-NOTE: WIN32 codec DLLs are not supported on your CPU ($host_arch).
+NOTE: Win32 codec DLLs are not supported on your CPU ($host_arch) or your
+operating system ($system_name). Why don't you help us port it?
 You may encounter a few AVI files that cannot be played due to missing
-open source video/audio codec support.
+Open Source video/audio codec support.
 
 EOF
 fi
@@ -5435,8 +5438,8 @@ fi
 
 cat <<EOF
 
-Check $TMPLOG if you wonder why an autodetection failed (check whether the
-development headers/packages are installed).
+Check $TMPLOG if you wonder why an autodetection failed (check whether
+the development headers/packages are installed).
 
 If you suspect a bug, please read DOCS/bugreports.html.