diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f76e8ff7a..9fe1b0a70 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-20  Christopher Faylor  <cgf@timesys.com>
+
+	* spawn.cc (av::fixup): Just blindly run any file if it has a .bat or
+	.cmd extension.
+
 2005-09-19  Christopher Faylor  <cgf@timesys.com>
 
 	* dcrt0.cc (do_exit): Only call sigproc_terminate from one location --
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 503fad148..df13d3b1b 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -1024,7 +1024,8 @@ int
 av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path, const char *ext)
 {
   bool exeext = strcasematch (ext, ".exe");
-  if (exeext && real_path.iscygexec ())
+  if (exeext && real_path.iscygexec () || strcasematch (ext, ".bat")
+      || strcasematch (ext, ".cmd"))
     return 0;
   while (1)
     {