diff --git a/ChangeLog b/ChangeLog
index c3fe7ae05..99293eda2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-12  Moritz Bunkus  <moritz@bunkus.org>
+
+	* Windows binaries after v0.8.1 require a new runtime DLL
+	archive. Please download it from
+	http://www.bunkus.org/videotools/mkvtoolnix/ Thanks.
+
 2004-01-11  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: new feature: Added the two new chapter flags 'hidden'
diff --git a/README.Windows.txt b/README.Windows.txt
index 09f171285..2e2669534 100644
--- a/README.Windows.txt
+++ b/README.Windows.txt
@@ -1,7 +1,14 @@
 mkvtoolnix 0.8.1 and Windows
 ----------------------------
 
----[ NOTE ]-----------------------------------------------------------
+---[ NOTE 1 ]---------------------------------------------------------
+Versions after 0.8.1 require a new runtime DLL archive. Please download
+it from http://www.bunkus.org/videotools/mkvtoolnix/
+
+Thanks.
+---[ NOTE 1 ]---------------------------------------------------------
+
+---[ NOTE 2 ]---------------------------------------------------------
 THIS FILE IS OUTDATED!
 I don't use cygwin anymore but mingw. Unfortunately compilation of
 all required libraries is FAR from easy with mingw as almost every
@@ -10,7 +17,7 @@ package needs some kind of patch of specialized Makefile.
 I'll update this file with build instructions for mingw when I
 find the time to do so. They're basically the instructions below
 with some additional steps here and there.
----[ NOTE ]----------------------------------------------------------
+---[ NOTE 2 ]--------------------------------------------------------
 
 Since 2003-05-09 it is possible to compile mkvtoolnix under the cygwin
 environment under Windows. These are some very short build and
diff --git a/autogen.sh b/autogen.sh
index 909722c86..d2b962874 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,8 +18,12 @@ if gcc -v 2>&1 | grep -i mingw > /dev/null 2> /dev/null; then
   sed -e "s!-f Makefile.mingw!!g" < Makefile.mingw.common > Makefile.common
 
   if test "x$1" = "x"; then
-    echo "Creating Makefile.options from Makefile.mingw.options"
-    cp Makefile.mingw.options Makefile.options
+    if [ ! -f Makefile.options ]; then
+      echo "Creating Makefile.options from Makefile.mingw.options"
+      cp Makefile.mingw.options Makefile.options
+    else
+      echo 'Not overwriting Makefile.options.'
+    fi
     echo "Creating config.h from config.h.mingw"
     cp config.h.mingw config.h
     echo ''