diff --git a/doc/fixes36.1 b/doc/fixes36.1
index a2e3933f8..84c2a161f 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -68,6 +68,9 @@ tty: specifying all four of role, race, gender, and alignment still prompted
 unix/X11: in top level Makefile, some commented out definitions of VARDATND
 	misspelled pilemark.xbm (as pilemark.xpm)
 unix/tty: fix compile warning about 'has_colors' for some configurations
+unix: options file with CR+LF line ends and an invalid option line resulted in
+	"ad option line: "whatever-the-line-was
+	because embedded carriage return character changed cursor's position
 win32gui: getversionstring() was overflowing the provided Help About buffer
 win32gui: guard against buffer overflow in in mswin_getlin()
 MacOSX: initial binary release was built from out of date source code that
diff --git a/src/files.c b/src/files.c
index 9e4f1d21e..18481a5f4 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	files.c	$NHDT-Date: 1449830204 2015/12/11 10:36:44 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.194 $ */
+/* NetHack 3.6	files.c	$NHDT-Date: 1451001643 2015/12/25 00:00:43 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.197 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -2581,8 +2581,12 @@ line at this level.
 OR: Forbid multiline stuff for alternate config sources.
 */
 #endif
-        if ((p = index(buf, '\n')) != 0)
-            *p = '\0';
+        if ((p = index(buf, '\n')) != 0) {
+            /* in case file has CR+LF format on non-CR+LF platform */
+            if (p > buf && *(p - 1) == '\r')
+                --p;
+            *p = '\0'; /* strip newline */
+        }
         if (!parse_config_line(fp, buf, src)) {
             static const char badoptionline[] = "Bad option line: \"%s\"";