Index: /trunk/kBuild/env.sh
===================================================================
--- /trunk/kBuild/env.sh	(revision 652)
+++ /trunk/kBuild/env.sh	(revision 653)
@@ -106,4 +106,8 @@
             ;;
 
+        WindowsNT|CYGWIN_NT-*)
+            BUILD_PLATFORM=win
+            ;;
+
         *)
             echo "$0: unknown os $BUILD_PLATFORM"
@@ -153,5 +157,5 @@
 _PATH_SEP=":"
 case "$BUILD_PLATFORM" in
-    os2|win32|winnt|win2k|winxp)
+    os2|win|win32|win64|nt|winnt|win2k|winxp)
         _SUFF_EXE=".exe"
         _PATH_SEP=";"
Index: /trunk/kBuild/envwin.cmd
===================================================================
--- /trunk/kBuild/envwin.cmd	(revision 652)
+++ /trunk/kBuild/envwin.cmd	(revision 653)
@@ -232,7 +232,4 @@
 :next
 
-REM # Make shell
-set MAKESHELL="%PATH_KBUILD%\bin\%BUILD_PLATFORM_ARCH%.%BUILD_PLATFORM%/kmk_ash.exe"
-
 REM # The PATH.
 IF "%BUILD_PLATFORM_ARCH%.%BUILD_PLATFORM%" = "x86.nt"      set PATH=%PATH_KBUILD%\bin\x86.win32;%PATH%
Index: /trunk/kBuild/header.kmk
===================================================================
--- /trunk/kBuild/header.kmk	(revision 652)
+++ /trunk/kBuild/header.kmk	(revision 653)
@@ -267,6 +267,6 @@
   endif
   ifeq ($(wildcard $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)),)
-   ifeq ($(filter-out win64 win nt ,$(BUILD_PLATFORM)),)
-    PATH_KBUILD_BIN := $(PATH_KBUILD)/bin/x86.win32
+   ifeq ($(filter-out win64 win32 win nt ,$(BUILD_PLATFORM)),)
+    PATH_KBUILD_BIN := $(PATH_KBUILD)/bin/x86.win
    endif
   endif