diff --git a/msys2-base/PKGBUILD b/msys2-base/PKGBUILD
index 6e076609..719dcc14 100644
--- a/msys2-base/PKGBUILD
+++ b/msys2-base/PKGBUILD
@@ -10,33 +10,33 @@ license=('BSD')
 groups=('base')
 source=('cmd'
 		'dep-search'
-        'mingw32_shell.bat'
-        'mingw64_shell.bat'
-        'msys2_shell.bat'
+		'mingw32_shell.bat'
+		'mingw64_shell.bat'
+		'msys2_shell.bat'
 		'msys.ico'
-        'regen-info.sh'
-        'start'
+		'regen-info.sh'
+		'start'
 		'shells')
 md5sums=('bf6a73107768c9b7f667430cfcb1d840'
          'dc5eeca33943c8ebb743ce21ce2193e3'
-         '230040b66ec648e08709ddf7df0f9a84'
-         '6ab445c67f0a9f06455127eb97079ffc'
-         '89d3e8bc14711cea32c355e813ef2856'
+         'e7dde9df74ba22119895cec9db5c9476'
+         'fdaa816935c894a7735c6cca592800e3'
+         'c3daf618c88f65d7b63d7654717e3d0f'
          '6999c504c2fddc295fb9a96a55baa40b'
          '7d3c63bb73e5c399ffac5e111c030bef'
          'c0f490709b10aed5e6bd12d72c53c043'
          '40132f918d61aaa3022ac4594a325627')
 
 package() {
-  mkdir -p $pkgdir/usr/{bin,etc,sbin}
-  
-  cp -f $srcdir/mingw32_shell.bat $pkgdir/usr/
-  cp -f $srcdir/mingw64_shell.bat $pkgdir/usr/
-  cp -f $srcdir/msys2_shell.bat $pkgdir/usr/
-  cp -f $srcdir/msys.ico $pkgdir/usr/
-  cp -f $srcdir/cmd $pkgdir/usr/bin/
-  cp -f $srcdir/start $pkgdir/usr/bin
-  cp -f $srcdir/dep-search $pkgdir/usr/bin
-  cp -f $srcdir/regen-info.sh $pkgdir/usr/sbin/
-  cp -f $srcdir/shells $pkgdir/usr/etc/
+	mkdir -p $pkgdir/usr/{bin,etc,sbin}
+
+	cp -f $srcdir/mingw32_shell.bat $pkgdir/usr/
+	cp -f $srcdir/mingw64_shell.bat $pkgdir/usr/
+	cp -f $srcdir/msys2_shell.bat $pkgdir/usr/
+	cp -f $srcdir/msys.ico $pkgdir/usr/
+	cp -f $srcdir/cmd $pkgdir/usr/bin/
+	cp -f $srcdir/start $pkgdir/usr/bin
+	cp -f $srcdir/dep-search $pkgdir/usr/bin
+	cp -f $srcdir/regen-info.sh $pkgdir/usr/sbin/
+	cp -f $srcdir/shells $pkgdir/usr/etc/
 }
diff --git a/msys2-base/mingw32_shell.bat b/msys2-base/mingw32_shell.bat
index 35a451b2..11139fa8 100644
--- a/msys2-base/mingw32_shell.bat
+++ b/msys2-base/mingw32_shell.bat
@@ -24,6 +24,8 @@ if NOT EXIST %WD%msys-2.0.dll set WD=%~dp0\bin\
 set MSYSTEM=MINGW32
 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>
 set MSYSCON=mintty.exe
 if "x%1" == "x-consolez" set MSYSCON=console.exe
 if "x%1" == "x-mintty" set MSYSCON=mintty.exe
diff --git a/msys2-base/mingw64_shell.bat b/msys2-base/mingw64_shell.bat
index 3e7fbd80..233842cf 100644
--- a/msys2-base/mingw64_shell.bat
+++ b/msys2-base/mingw64_shell.bat
@@ -24,6 +24,8 @@ if NOT EXIST %WD%msys-2.0.dll set WD=%~dp0\bin\
 set MSYSTEM=MINGW64
 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>
 set MSYSCON=mintty.exe
 if "x%1" == "x-consolez" set MSYSCON=console.exe
 if "x%1" == "x-mintty" set MSYSCON=mintty.exe
diff --git a/msys2-base/msys2_shell.bat b/msys2-base/msys2_shell.bat
index 271ea746..7f9991d3 100644
--- a/msys2-base/msys2_shell.bat
+++ b/msys2-base/msys2_shell.bat
@@ -24,6 +24,8 @@ if NOT EXIST %WD%msys-2.0.dll set WD=%~dp0\bin\
 set MSYSTEM=MSYS
 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>
 set MSYSCON=mintty.exe
 if "x%1" == "x-consolez" set MSYSCON=console.exe
 if "x%1" == "x-mintty" set MSYSCON=mintty.exe