--- a/core/group/fshell_core.iby	Fri Aug 06 17:00:19 2010 +0100
+++ b/core/group/fshell_core.iby	Tue Aug 10 12:33:46 2010 +0100
@@ -69,9 +69,6 @@
 #endif // FSHELL_CORE_SUPPORT_SERIAL_ICON
 
 FSHELL_DATA_FILE(ZSYSTEM\console\scripts\comm.script, system\console\scripts\comm.script)
-#ifdef FSHELL_AUTOEXEC
-FSHELL_DATA_FILE(DATAZ_\autoexec.bat.comm, autoexec.bat)
-#endif
 
 FSHELL_EXECUTABLE_FILE(iosrv.exe)
 FSHELL_EXECUTABLE_FILE(iocli.dll)
@@ -81,11 +78,21 @@
 FSHELL_ECOM_PLUGIN(sbrec.dll, sbrec.rsc)
 FSHELL_DATA_FILE(ZPRIVATE\10003a3f\apps\sbapp_reg.RSC, Private\10003a3f\import\Apps\sbapp_reg.RSC)
 FSHELL_DATA_FILE(ZRESOURCE\Apps\sbapp_loc.rsc, Resource\Apps\sbapp_loc.rsc)
+#endif
+
 #ifdef FSHELL_AUTOSTART
-patchdata sbrec.dll@KAutoStartFshell 1
 FSHELL_DATA_FILE(ZSYSTEM\console\scripts\autostart.script, system\console\scripts\autostart.script)
+#if defined(FSHELL_CORE_SUPPORT_SHEBANG)
+patchdata sbrec.dll@KAutoStartFshell 1
+#elif !defined(FSHELL_WSERV_SUPPORT)
+// Do it the eshell way
+FSHELL_DATA_FILE(DATAZ_\fshell_autoexec.bat, autoexec.bat)
+#else
+// If we don't support a recogniser but aren't textshell, we're not a configuration worth worrying about
 #endif
-#endif
+#endif // FSHELL_AUTOSTART
+
+
 #ifdef FSHELL_CORE_SUPPORT_PIPSRUN
 FSHELL_EXECUTABLE_FILE(pipsrun.exe)
 #endif