Index: /trunk/src/kash/Makefile.kmk
===================================================================
--- /trunk/src/kash/Makefile.kmk	(revision 2303)
+++ /trunk/src/kash/Makefile.kmk	(revision 2304)
@@ -40,5 +40,5 @@
 ## @todo bring over PC_SLASHES?
 kash_DEFS.win = \
-	BSD PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS YY_NO_UNISTD_H
+	BSD PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS YY_NO_UNISTD_H SH_DEAL_WITH_CRLF
 kash_DEFS.os2 = \
 	HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME \
Index: /trunk/src/kash/expand.c
===================================================================
--- /trunk/src/kash/expand.c	(revision 2303)
+++ /trunk/src/kash/expand.c	(revision 2304)
@@ -457,6 +457,11 @@
 	/* Eat all trailing newlines */
 	p = stackblock(psh) + startloc;
-	while (dest > p && dest[-1] == '\n')
+	while (dest > p && dest[-1] == '\n') {
 		STUNPUTC(psh, dest);
+#ifdef SH_DEAL_WITH_CRLF
+		if (dest > p && dest[-1] == '\r')
+			STUNPUTC(psh, dest);
+#endif
+	}
 
 	if (in.fd >= 0)
Index: /trunk/src/kash/tests/redirect-3
===================================================================
--- /trunk/src/kash/tests/redirect-3	(revision 2303)
+++ /trunk/src/kash/tests/redirect-3	(revision 2304)
@@ -11,7 +11,7 @@
 echo 3 >> $TMPFILE
 VAR=`$CMD_SED -e '/2/!d' < $TMPFILE`
-$CMD_RM -f $TMPFILE
+#$CMD_RM -f $TMPFILE
 if test "$VAR" != "2"; then
-    echo "redirect-3: FAILURE - VAR=$VAR"
+    echo "redirect-3: FAILURE - VAR=$VAR."
     exit 1
 fi