diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c65fbd4c9a..0b39b61463 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+Fri Jul  4 14:49:33 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* source.c (OPEN_MODE, FDOPEN_MODE): Define; value depends upon
+	whether CRLF_SOURCE_FILES is defined.
+	(open_source_file): Use OPEN_MODE with open and openp.
+	(print_source_lines): Use FDOPEN_MODE with fdopen.  If
+	CRLF_SOURCE_FILES is defined, ignore \r characters.
+	(forward_search_command): Use FDOPEN_MODE with fdopen.
+	(reverse_search_command): Likewise.
+	* config/i386/xm-cygwin32.h (CRLF_SOURCE_FILES): Define.
+	(LSEEK_NOT_LINEAR): Don't define.
+
 Thu Jul  3 17:41:46 1997  Michael Snyder  (msnyder@cleaver.cygnus.com)
 
 	* mips-tdep.c (mips_extract_return_value): align 4-byte float
diff --git a/gdb/config/i386/xm-cygwin32.h b/gdb/config/i386/xm-cygwin32.h
index c20bc130f6..b722f97480 100644
--- a/gdb/config/i386/xm-cygwin32.h
+++ b/gdb/config/i386/xm-cygwin32.h
@@ -1,5 +1,5 @@
 /* Definitions for hosting on WIN32, for GDB.
-   Copyright 1995, 1996 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -32,5 +32,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    So disable immediate_quit inside request_quit */
 #define REQUEST_QUIT 
 
-/* Define this lseek(n) != nth byte of file */
-#define LSEEK_NOT_LINEAR
+/* Define this if source files use \r\n rather than just \n.  */
+#define CRLF_SOURCE_FILES