diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 10f1f4f65..a24134135 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-27  Christopher Faylor  <cgf@timesys.com>
+
+	* gendef: Use nocr to remove \r's from input.
+	gendef (nocr): New function.
+
 2005-07-27  Christopher Faylor  <cgf@timesys.com>
 
 	* fhandler_clipboard.cc (fhandler_dev_clipboard::close): Set membuffer
diff --git a/winsup/cygwin/gendef b/winsup/cygwin/gendef
index 83e9e1245..9d8a211e6 100755
--- a/winsup/cygwin/gendef
+++ b/winsup/cygwin/gendef
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
+sub nocr(@);
 my $in = shift;
 my $tls_offsets = shift;
 my $out = shift;
@@ -15,11 +16,11 @@ require $tls_offsets;
 open(IN, $in) or die "$0: couldn't open \"$in\" - $!\n";
 my @top = ();
 while (<IN>) {
-    push(@top, $_);
+    push(@top, nocr $_);
     last if /^\s*exports\s*$/i;
 }
-my $libline = <IN>;
-my @in = <IN>;
+my $libline = nocr scalar(<IN>);
+my @in = nocr <IN>;
 close(IN);
 
 my %sigfe = ();
@@ -349,3 +350,7 @@ _longjmp:
 	ret
 EOF
 }
+
+sub nocr(@) {
+    map {s/\r//g; $_} @_;
+}