diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD
index 0f7a9609..df9e3ba8 100644
--- a/filesystem/PKGBUILD
+++ b/filesystem/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Alethea Rose <alethea@alethearose.com>
 
 pkgname=filesystem
-pkgver=2021.06
-pkgrel=2
+pkgver=2021.11
+pkgrel=1
 pkgdesc='Base filesystem'
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -30,6 +30,8 @@ source=('bash.bash_logout'
         'msys2.ico'
         'ucrt64.ico'
         'clang64.ico'
+        'clang32.ico'
+        'clangarm64.ico'
         'msys2_shell.cmd'
         'msystem'
         'nsswitch.conf'
@@ -65,14 +67,16 @@ sha256sums=('742a7d66b7a5ebd2b8461728c5b44a46b2305fd2116208eecae5f45828938ea0'
             '793b9450a1a59a6c294e51fd0c2a47090d68c68ff2f33a25a11b45f6408c3917'
             '733e97cbb823773e1a08a91a41035a7692bc0ff270d3c894224911b4b091db44'
             '56d4080c15dff89a6263f3d5f9aa68849b2062179cabd6d78edfe0e3af6bf64a'
-            '71940697f1c9d7dded0f773fefc517d2f5b5921a9634d10246e6a45a598068d7'
+            '58f7431d7d8d9d09ebd3185c090404682d760bf18c27f94085007b037a5889bd'
+            '3b7af99516768485383b34d606749e6f98a250372a8191bc8d3a962d66bdfe35'
+            '069dec63aa8796789084071cce2b3ea5a7bcf88fb3cf40b7aeb1acd79d0e8ada'
             'c54f238a7b33680d3f57db1cdf99504e551d4395e5503e84b36135d9a89b05ab'
             '91f1f918cf13deab0124082086e990786113b0e710dbda4678d8fc14905ad94d'
             '6446359419e13310d74ab54086271acc2f4ed0dfe97a474cdd06cd7c55ee59a4'
             '6c0ca979c7b146b3750103b1296a399764f4e1b222ee091d3aa072b6da16c1a5'
             'cbec90c9403826bf6d8dd1fed16240b9d8695ec15df5dcdab7e485bb46c016ab'
             'd7f787849de5753d7430d7be749d52d785f1e4c59585cf4e4091f8c35f8e85e0'
-            'ed6c5d64be516a6d29131a5d8fe3d8c3f0d3fd21bffafdd85690a8818336c357'
+            'ad9873e18169ca87194af3413bdcbda536d9600b4f7d24fa9f7d59928309ff4a'
             'f63241cc56aa7b7ec6962d19991d211b4e1641b78ba5226835118ab493830a8b'
             'e96c1f54ffff792e738aa032815c82c30821b0683806e5ed0ba2a759db2fd494'
             'a5b9c91241d5e1f0bb461119b3e36f5f661ff6f0758e63e756275fa5cb31a410'
@@ -128,6 +132,8 @@ package() {
   install -m644 ${srcdir}/mingw64.ico mingw64.ico
   install -m644 ${srcdir}/ucrt64.ico ucrt64.ico
   install -m644 ${srcdir}/clang64.ico clang64.ico
+  install -m644 ${srcdir}/clang32.ico clang32.ico
+  install -m644 ${srcdir}/clangarm64.ico clangarm64.ico
   install -m644 ${srcdir}/msys2.ico msys2.ico
   install -m755 ${srcdir}/msys2_shell.cmd msys2_shell.cmd
 
diff --git a/filesystem/clang32.ico b/filesystem/clang32.ico
new file mode 100644
index 00000000..39039bab
Binary files /dev/null and b/filesystem/clang32.ico differ
diff --git a/filesystem/clangarm64.ico b/filesystem/clangarm64.ico
new file mode 100644
index 00000000..088a279d
Binary files /dev/null and b/filesystem/clangarm64.ico differ
diff --git a/filesystem/msys2_shell.cmd b/filesystem/msys2_shell.cmd
index e21dcf4d..976a9313 100644
--- a/filesystem/msys2_shell.cmd
+++ b/filesystem/msys2_shell.cmd
@@ -41,6 +41,8 @@ if "x%~1" == "x-mingw32" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW3
 if "x%~1" == "x-mingw64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW64& goto :checkparams
 if "x%~1" == "x-ucrt64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=UCRT64& goto :checkparams
 if "x%~1" == "x-clang64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANG64& goto :checkparams
+if "x%~1" == "x-clang32" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANG32& goto :checkparams
+if "x%~1" == "x-clangarm64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANGARM64& goto :checkparams
 if "x%~1" == "x-mingw" shift& set /a msys2_shiftCounter+=1& (if exist "%WD%..\..\mingw64" (set MSYSTEM=MINGW64) else (set MSYSTEM=MINGW32))& goto :checkparams
 rem Console types
 if "x%~1" == "x-mintty" shift& set /a msys2_shiftCounter+=1& set MSYSCON=mintty.exe& goto :checkparams
@@ -108,6 +110,12 @@ if "%MSYSTEM%" == "MINGW32" (
 ) else if "%MSYSTEM%" == "CLANG64" (
   set "CONTITLE=MinGW Clang x64"
   set "CONICON=clang64.ico"
+) else if "%MSYSTEM%" == "CLANG32" (
+  set "CONTITLE=MinGW Clang x32"
+  set "CONICON=clang32.ico"
+) else if "%MSYSTEM%" == "CLANGARM64" (
+  set "CONTITLE=MinGW Clang ARM64"
+  set "CONICON=clangarm64.ico"
 ) else (
   set "CONTITLE=MSYS2 MSYS"
   set "CONICON=msys2.ico"
diff --git a/filesystem/shell b/filesystem/shell
index 7b8bb701..ffb5ca10 100644
--- a/filesystem/shell
+++ b/filesystem/shell
@@ -36,12 +36,12 @@ fi
 
 # Argument validation
 
-if [[ "${BASH_SOURCE}" != "${0}" && ! "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|msys)$ ]]; then
+if [[ "${BASH_SOURCE}" != "${0}" && ! "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clang32|clangarm64|msys)$ ]]; then
     echo "Unrecognized shell type ${1}"
     return 1
 fi
 
-if [[ "${BASH_SOURCE}" = "${0}" && "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|msys)$ ]]; then
+if [[ "${BASH_SOURCE}" = "${0}" && "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clang32|clangarm64|msys)$ ]]; then
     echo "Cannot switch to ${1} shell without sourcing"
     exit 1
 fi
@@ -81,6 +81,8 @@ else
         /mingw64/*)      winpty "${@}" || exit ;;
         /ucrt64/*)       winpty "${@}" || exit ;;
         /clang64/*)      winpty "${@}" || exit ;;
+        /clang32/*)      winpty "${@}" || exit ;;
+        /clangarm64/*)   winpty "${@}" || exit ;;
         *)                      "${@}" || exit ;;
     esac
     exit 0