diff --git a/ChangeLog b/ChangeLog
index e59101a1..ecc3bafc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-05  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #40817: Elf file support (possibly) not working on 6.0.1 windows build
+	* fileio.c (fileio): open file in binary mode also for FMT_ELF
+
 2013-12-04  Rene Liebscher <R.Liebscher@gmx.de>
 
 	Rework of bitbanging functions setpin, getpin, highpulsepin to make simplier use
diff --git a/NEWS b/NEWS
index 0b6aa222..b7787a75 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Current:
   * Bugfixes
     - bug #40055: AVRDUDE segfaults when writing eeprom
     - bug #40085: Typo fix in fuses report (for 6.1-svn-20130917)
+    - bug #40817: Elf file support (possibly) not working on 6.0.1 windows build
     - patch #XXXX: xxx
 
   * Internals:
diff --git a/fileio.c b/fileio.c
index c636e6b2..85d7f55c 100644
--- a/fileio.c
+++ b/fileio.c
@@ -1416,7 +1416,11 @@ static int fmt_autodetect(char * fname)
   int found;
   int first = 1;
 
+#if defined(WIN32NATIVE)
   f = fopen(fname, "r");
+#else
+  f = fopen(fname, "rb");
+#endif
   if (f == NULL) {
     fprintf(stderr, "%s: error opening %s: %s\n",
             progname, fname, strerror(errno));
@@ -1562,8 +1566,8 @@ int fileio(int op, char * filename, FILEFMT format,
   }
 
 #if defined(WIN32NATIVE)
-  /* Open Raw Binary format in binary mode on Windows.*/
-  if(format == FMT_RBIN)
+  /* Open Raw Binary and ELF format in binary mode on Windows.*/
+  if(format == FMT_RBIN || format == FMT_ELF)
   {
       if(fio.op == FIO_READ)
       {