diff --git a/build-windows/generate_code.cmd b/build-windows/generate_code.cmd
index ad9c711..e4cac40 100644
--- a/build-windows/generate_code.cmd
+++ b/build-windows/generate_code.cmd
@@ -11,6 +11,11 @@ SET java_pkg_basename=foundation\pEp\jniadapter
 MKDIR %marker_dir%
 MKDIR %exceptions_directory%
 
+:: Generate Status files
+SH ..\utils\gen_status_codes.sh ..\..\pEp\pEpEngine.h
+MV passphrase_status_list.yml2 ..\src\codegen\
+MV status_list.yml2 ..\src\codegen\
+
 :: Generate YML2 code
 PUSHD ..
 CD src
diff --git a/utils/gen_status_codes.sh b/utils/gen_status_codes.sh
index 238db98..2bd2e83 100644
--- a/utils/gen_status_codes.sh
+++ b/utils/gen_status_codes.sh
@@ -23,6 +23,7 @@ OS="$(uname -s)"
 case "${OS}" in
     Linux*)     SED=sed;;
     Darwin*)    SED=gsed;;
+    MSYS*)      SED=sed;;
     CYGWIN*)    echo "UNSUPORTED YET" && exit;;
     MINGW*)     echo "UNSUPORTED YET" && exit;;
     *)          echo "UNKNOWN:${OS}" && exit;;