diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6512b56f9..cfc1ebd50 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-13  Christopher Faylor  <cgf@timesys.com>
+
+	* spawn.cc (spawn_guts): Move ch.set() call back to where it was
+	supposed to be.
+
 2006-04-13  Corinna Vinschen  <corinna@vinschen.de>
 
 	* sysconf.cc (sysconf): Add _SC_THREADS, _SC_THREAD_ATTR_STACKSIZE,
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index a39145ed8..94ead62f9 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -462,7 +462,6 @@ spawn_guts (const char * prog_arg, const char *const *argv,
 
   cygheap->fdtab.set_file_pointers_for_exec ();
 
-  ch.set (chtype, real_path.iscygexec ());
   moreinfo->envp = build_env (envp, envblock, moreinfo->envc, real_path.iscygexec ());
   if (!moreinfo->envp || !envblock)
     {
@@ -470,6 +469,7 @@ spawn_guts (const char * prog_arg, const char *const *argv,
       res = -1;
       goto out;
     }
+  ch.set (chtype, real_path.iscygexec ());
   ch.moreinfo = moreinfo;
 
   si.lpReserved2 = (LPBYTE) &ch;