diff --git a/README.md b/README.md
index eb2174ff..d33ff363 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ MSYS2-packages
 
 Package scripts for MSYS2.
 
-To build these, run msys2_shell.bat then from the bash prompt.
+To build these, run start_shell.cmd then from the bash prompt.
 
     cd ${package-name}
     makepkg
diff --git a/cmake/PKGBUILD b/cmake/PKGBUILD
index d2bec584..f0c5a7cb 100644
--- a/cmake/PKGBUILD
+++ b/cmake/PKGBUILD
@@ -31,7 +31,7 @@ source=("https://www.cmake.org/files/v3.5/${pkgname}-${pkgver}.tar.gz"
         "3.5.2-cpuinfo.patch"
         "3.5.2-cygwin-paths.patch")
 sha256sums=('92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a'
-            'ff62957b203f001dc5ae9f628a2ff4276029d976c3f6b5e53a806f9074ab5d1e'
+            'ecb9b77aebc13b99323fcad5e844d7414cfa88fcb2118829d5c73b0ac925220c'
             'b7e398e70b97088f88a0688e8a0794d6780d3cdb91075388a30908dc4b405eb7'
             '98dca846de0ca7b71884e26678317f85e78e01862d58a29ce923c835ca7d614f'
             '4f312510b45774ef299982ea112efbae4ef89cc680a7e4a14f2d1cf619b9749c'
diff --git a/cmake/cmake-3.5.2-msys.patch b/cmake/cmake-3.5.2-msys.patch
index 5ba29de2..c91cd862 100644
--- a/cmake/cmake-3.5.2-msys.patch
+++ b/cmake/cmake-3.5.2-msys.patch
@@ -479,7 +479,7 @@ diff -Naur cmake-2.8.11.2/Modules/FindMsys.cmake cmake-2.8.11.2-msys/Modules/Fin
 +
 +if (WIN32)
 +  find_path(MSYS_INSTALL_PATH
-+    msys2_shell.bat
++    start_shell.cmd
 +    "C:/MSYS"
 +    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MSYS\\setup;rootdir]"
 +    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\MSYS\\mounts v2\\/;native]"
diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD
index 0f1c2367..12f1ba80 100644
--- a/filesystem/PKGBUILD
+++ b/filesystem/PKGBUILD
@@ -25,10 +25,7 @@ source=('bash.bash_logout'
         'dot.profile'
         'fstab'
         'start_shell.cmd'
-        'mingw32_shell.bat'
-        'mingw64_shell.bat'
         'msystem'
-        'msys2_shell.bat'
         'msys2.ico'
         'nsswitch.conf'
         'profile'
@@ -56,17 +53,14 @@ sha256sums=('6d651f6b0b2d173961a3fa21acd9d44c783ed9cd73a031687698c8b9ed1f6dee'
             '50c3746d621e682e3560e1b37cc1ac5d988460064a20ed15f107c203ac5ad622'
             '9620bdf1c82ea3f14c3553c44a2006ea61ff3f5a775a2a053130a59cc186daf5'
             'e38c92ded3ba1cb5bedec40dc3691a4558d88bb632e07b614df7bb10fcd34cad'
-            '73bf20b5d11a5d2e8754bd62bb8a7cbb4fd31dfe781169723b1842aa62c323ab'
-            '71f3031066ca0824e4b494127f74a41920b15f8b6d3f573c43da080050c0e1ca'
             '3afdc0d689da510c32a04da2a021241c6fda85fdf1f1f558da5f1d778a2037f7'
-            'cc4088d418a2dbb1ec754a0e89b80b8521b04011c08b8f5c9a563f1bdd745c8f'
             '7d6994d7caf52a459b562cfb0da1d758a4b7bca478d1df00de3a96686e59008e'
             '91f1f918cf13deab0124082086e990786113b0e710dbda4678d8fc14905ad94d'
             '5b3109cb32639aff640d5629e9c1a898e540b8b8d38ac26aa34014df6b002b63'
             '0a3a3b131ace34f11f428118dfe81b34da148e29b6bea3b027d79bebd47141a7'
             '020d0619a6af9a4d6e1068cb77f2789bcf470380426214e90177f5596d651835'
             '756df34c5b28478a81331785de0f56438bb652cf5f29029a9db2d83281361340'
-            '9f7e0f3f640e8acd0ec3a92231bb7d983b2b4741ccc16cac649d32c4e8a652f8'
+            '4da1901fc060198cb1261d1f855b4f76042a50272815726d8e0518afdcc4689f'
             'f63241cc56aa7b7ec6962d19991d211b4e1641b78ba5226835118ab493830a8b'
             'e96c1f54ffff792e738aa032815c82c30821b0683806e5ed0ba2a759db2fd494'
             '95105051d31ecbe4ace262a4496ec1055bdd14d61b7d475a771b56fe15f8ccd9'
@@ -116,9 +110,6 @@ package() {
 
   install -m644 ${srcdir}/msys2.ico msys2.ico
   install -m755 ${srcdir}/start_shell.cmd start_shell.cmd
-  install -m755 ${srcdir}/msys2_shell.bat msys2_shell.bat
-  install -m755 ${srcdir}/mingw32_shell.bat mingw32_shell.bat
-  install -m755 ${srcdir}/mingw64_shell.bat mingw64_shell.bat
 
   # setup /var
   #
diff --git a/filesystem/mingw32_shell.bat b/filesystem/mingw32_shell.bat
deleted file mode 100644
index c4bd20ec..00000000
--- a/filesystem/mingw32_shell.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-:
-@echo off
-
-rem To activate windows native symlinks uncomment next line
-rem set MSYS=winsymlinks:nativestrict
-
-rem Set debugging program for errors
-rem set MSYS=error_start:%WD%../../mingw32/bin/qtcreator.exe^|-debug^|^<process-id^>
-
-rem To export full current PATH from environment into MSYS2 uncomment next line
-rem set MSYS2_PATH_TYPE=inherit
-
-call "%~dp0start_shell.cmd" -mingw32 %*
-:EOF
diff --git a/filesystem/mingw64_shell.bat b/filesystem/mingw64_shell.bat
deleted file mode 100644
index df9b4870..00000000
--- a/filesystem/mingw64_shell.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-:
-@echo off
-
-rem To activate windows native symlinks uncomment next line
-rem set MSYS=winsymlinks:nativestrict
-
-rem Set debugging program for errors
-rem set MSYS=error_start:%WD%../../mingw64/bin/qtcreator.exe^|-debug^|^<process-id^>
-
-rem To export full current PATH from environment into MSYS2 uncomment next line
-rem set MSYS2_PATH_TYPE=inherit
-
-call "%~dp0start_shell.cmd" -mingw64 %*
-:EOF
diff --git a/filesystem/msys2_shell.bat b/filesystem/msys2_shell.bat
deleted file mode 100644
index 751bee68..00000000
--- a/filesystem/msys2_shell.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-:
-@echo off
-
-rem To activate windows native symlinks uncomment next line
-rem set MSYS=winsymlinks:nativestrict
-
-rem Set debugging program for errors
-rem set MSYS=error_start:%WD%../../mingw32/bin/qtcreator.exe^|-debug^|^<process-id^>
-
-rem To export full current PATH from environment into MSYS2 uncomment next line
-rem set MSYS2_PATH_TYPE=inherit
-
-call "%~dp0start_shell.cmd" -msys %*
-:EOF
diff --git a/msys2-installer/compress-msys2 b/msys2-installer/compress-msys2
index 4290e6b0..8b719c63 100644
--- a/msys2-installer/compress-msys2
+++ b/msys2-installer/compress-msys2
@@ -11,7 +11,7 @@ if [ -f /tmp/$_filename ]; then
 fi
 
 _dirs=
-for curr_dir in /etc /include /lib /libexec /sbin /share /ssl /tmp /usr /var /mingw32_shell.bat /mingw64_shell.bat /msys2.ico /msys2_shell.bat /start_shell.cmd; do
+for curr_dir in /etc /include /lib /libexec /sbin /share /ssl /tmp /usr /var /msys2.ico /start_shell.cmd; do
   if [[ -d $curr_dir || -f $curr_dir ]]; then
     _dirs="$_dirs $curr_dir"
   fi
diff --git a/msys2-installer/make-msys2-installer b/msys2-installer/make-msys2-installer
index c25db5ce..7b32aa99 100644
--- a/msys2-installer/make-msys2-installer
+++ b/msys2-installer/make-msys2-installer
@@ -59,7 +59,7 @@ create_archives() {
   [ -d "${_data}" ] && rm -rf "${_data}"
   mkdir -p "${_data}"
   local _dirs=
-  for curr_dir in /etc /var /tmp /usr /mingw32_shell.bat /mingw64_shell.bat /msys2_shell.bat /start_shell.cmd /msys2.ico /autorebase.bat autorebasebase1st.bat; do
+  for curr_dir in /etc /var /tmp /usr /start_shell.cmd /msys2.ico /autorebase.bat autorebasebase1st.bat; do
     if [[ -d ${_newmsys}${curr_dir} || -f ${_newmsys}${curr_dir} ]]; then
       _dirs="${_dirs} ${_newmsys}$curr_dir"
     fi
diff --git a/msys2-installer/make-msys2-installer.bat b/msys2-installer/make-msys2-installer.bat
index 15c048e1..18ee1b05 100644
--- a/msys2-installer/make-msys2-installer.bat
+++ b/msys2-installer/make-msys2-installer.bat
@@ -7,7 +7,7 @@ if "%1"=="" (
   exit /b 1
 )
 
-if not exist %1\msys2_shell.bat (
+if not exist %1\start_shell.cmd (
   echo '%1' does not seem to be the root folder of an existing MSYS2 installation?!
   exit /b 2
 )
diff --git a/msys2-installer/qt-ifw/config/config.xml b/msys2-installer/qt-ifw/config/config.xml
index 6de953aa..6d64239e 100644
--- a/msys2-installer/qt-ifw/config/config.xml
+++ b/msys2-installer/qt-ifw/config/config.xml
@@ -5,7 +5,7 @@
     <Title>MSYS2 @BITNESS@bit</Title>
     <Publisher>The MSYS2 Developers</Publisher>
     <StartMenuDir>MSYS2 @BITNESS@bit</StartMenuDir>
-    <RunProgram>@TargetDir@/msys2_shell.bat</RunProgram>
+    <RunProgram>@TargetDir@/start_shell.cmd</RunProgram>
     <RunProgramArguments></RunProgramArguments>
     <InstallerApplicationIcon>../../msys2</InstallerApplicationIcon>
     <InstallerWindowIcon>../../msys2</InstallerWindowIcon>