diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD
index abd02646..011a7e37 100644
--- a/filesystem/PKGBUILD
+++ b/filesystem/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Alethea Rose <alethea@alethearose.com>
 
 pkgname=filesystem
-pkgver=2021.02
+pkgver=2021.03
 pkgrel=1
 pkgdesc='Base filesystem'
 arch=('i686' 'x86_64')
@@ -45,10 +45,6 @@ source=('bash.bash_logout'
         '08-xml-catalog.post'
         'cygwin.ldif'
         'main-config.site'
-        'clang32-config.site'
-        'clang64-config.site'
-        'mingw64-config.site'
-        'mingw32-config.site'
         'redirect-config.site')
 sha256sums=('742a7d66b7a5ebd2b8461728c5b44a46b2305fd2116208eecae5f45828938ea0'
             'dfb0a5c21b1b1dcec942f556fe32967bd78207c47ff28093837a37d2ed457e92'
@@ -64,7 +60,7 @@ sha256sums=('742a7d66b7a5ebd2b8461728c5b44a46b2305fd2116208eecae5f45828938ea0'
             'be368cc325f33db9035dc4839bb967bebe9b896bdd7582749124245ccbc38c9f'
             '7d6994d7caf52a459b562cfb0da1d758a4b7bca478d1df00de3a96686e59008e'
             '01a9355fe15a0a48b99b6bc0194d48f7c4bc632033137c9ddeb7bf0cf96516c1'
-            'c6faa86edf92199c54c45bde65115eb872336eb8a10ca24a8bf3ea92d9d8db2c'
+            '12e9bc56960daf5ad5e56a23a9abd1fd752e67f78358a756c4b3bf00173eb048'
             '91f1f918cf13deab0124082086e990786113b0e710dbda4678d8fc14905ad94d'
             '118e113df16328ac41426ff3c5276e80fc6e8b0af999c6df5e56d13e3f21f7af'
             '6c0ca979c7b146b3750103b1296a399764f4e1b222ee091d3aa072b6da16c1a5'
@@ -79,11 +75,7 @@ sha256sums=('742a7d66b7a5ebd2b8461728c5b44a46b2305fd2116208eecae5f45828938ea0'
             'fd6eb255b5a35e62a34a54bf39598134296a11bddd3e6a30edd008cbe136b9f3'
             'ad8533809ea2b1bce0a41b3a0a24dbc7a9f58b992ceb40cc9f862b1978032790'
             'caf25e3390331c6a22cc91f1c1bc551a9f87c59171dd3ef7b3b6016859a10fb5'
-            '475d79aa6d4cec9f286762d0be1a0ef7c849091ddde24d2e834d186053644eed'
-            'a81da3a792bc0eed2149b18fad6680207ce7a902613323aeb18f83271de54142'
-            '50d50db353671ae1bf78e10ad90f2b86c15dc8ae132c5142e409ad541e24edc3'
-            'c8221dce8415f3a000b4068dca9b6f8ab1944a40e7881789ead4ba54cb901bc9'
-            '2ed001d7a1e1d7b3f53d2cd8f4a8b335bfef77ed3bce14558ef5aa1f46a846f0'
+            '8e0c468c5186d769d5303d92efd05b7e1018afe4b0915cb71356808ee1601f07'
             '26bf8d1acade9431d60c035a7ddfa9cb0775d5b9a457c5aca56f51c5f2f93f98')
 
 build() {
@@ -95,7 +87,7 @@ package() {
 
   # setup root filesystem
   #
-  for d in dev etc home usr var opt mingw32 mingw64 clang32 clang64; do
+  for d in dev etc home usr var opt; do
     install -d -m755 ${d}
   done
 
@@ -148,22 +140,18 @@ package() {
     install -m755 ${srcdir}/${f} usr/bin
   done
 
-  # setup /mingw hierarchies
-  #
-  for m in mingw32 mingw64 clang32 clang64; do
-    for d in bin etc include lib share; do
-      install -d -m755 ${m}/${d}
-    done
-  done
-
   install -Dm 644 ${srcdir}/cygwin.ldif usr/share/Msys/cygwin.ldif
 
   # setup 'configure' helpers
   #
   install -m644 ${srcdir}/main-config.site etc/config.site
-  install -m644 ${srcdir}/clang32-config.site clang32/etc/config.site
-  install -m644 ${srcdir}/clang64-config.site clang64/etc/config.site
-  install -m644 ${srcdir}/mingw64-config.site mingw64/etc/config.site
-  install -m644 ${srcdir}/mingw32-config.site mingw32/etc/config.site
   install -D -m644 ${srcdir}/redirect-config.site usr/local/etc/config.site
+
+  # setup /mingw hierarchies
+  for m in mingw32 mingw64 clang32 clang64; do
+    install -d -m755 ${m}
+    for d in bin etc include lib share; do
+      install -d -m755 ${m}/${d}
+    done
+  done
 }
diff --git a/filesystem/clang32-config.site b/filesystem/clang32-config.site
deleted file mode 100644
index bb39cb81..00000000
--- a/filesystem/clang32-config.site
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is in public domain.
-# Original author: Karlson2k (Evgeny Grin)
-# Written for MSys2/MinGW64 to help running 'configure' scripts
-
-# Defaults for MinGW64-targeted programs
-
-# Set proper selfname on bash and fallback to default name on other shells
-test -n "${BASH_SOURCE}" 2>/dev/null && config_site_me="${BASH_SOURCE[0]##*/}" || config_site_me=config.site
-
-# Set default 'host' to speedup configure
-if test -z "$build_alias"; then
-  build_alias="${MSYSTEM_CHOST-i686-w64-mingw32}"  && \
-    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default build_alias set to $build_alias" >&5
-fi
-
-# Set default 'prefix' to "/clang32"
-if ( test -z "$prefix" || test "x$prefix" = "xNONE" ) && \
-   ( test -z "$exec_prefix" || test "x$exec_prefix" = "xNONE" ); then
-  prefix="${MSYSTEM_PREFIX-/clang32}" && \
-    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default prefix set to $prefix" >&5
-fi
diff --git a/filesystem/clang64-config.site b/filesystem/clang64-config.site
deleted file mode 100644
index 8aa08088..00000000
--- a/filesystem/clang64-config.site
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is in public domain.
-# Original author: Karlson2k (Evgeny Grin)
-# Written for MSys2/MinGW64 to help running 'configure' scripts
-
-# Defaults for MinGW64-targeted programs
-
-# Set proper selfname on bash and fallback to default name on other shells
-test -n "${BASH_SOURCE}" 2>/dev/null && config_site_me="${BASH_SOURCE[0]##*/}" || config_site_me=config.site
-
-# Set default 'host' to speedup configure
-if test -z "$build_alias"; then
-  build_alias="${MSYSTEM_CHOST-x86_64-w64-mingw32}" && \
-    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default build_alias set to $build_alias" >&5
-fi
-
-# Set default 'prefix' to "/clang64"
-if ( test -z "$prefix" || test "x$prefix" = "xNONE" ) && \
-   ( test -z "$exec_prefix" || test "x$exec_prefix" = "xNONE" ); then
-  prefix="${MSYSTEM_PREFIX-/clang64}" && \
-    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default prefix set to $prefix" >&5
-fi
diff --git a/filesystem/main-config.site b/filesystem/main-config.site
index fcc3b4f7..6a0d281e 100644
--- a/filesystem/main-config.site
+++ b/filesystem/main-config.site
@@ -2,40 +2,20 @@
 # Original author: Karlson2k (Evgeny Grin)
 # Written for MSys2 to help running 'configure' scripts
 
-# Use correct config.site even if CONFIG_SITE is not set
-if test "x$MSYSTEM" = "xMINGW64"; then
-  if test -r "${MINGW_PREFIX-/mingw64}/etc/config.site"; then
-    . "${MINGW_PREFIX-/mingw64}/etc/config.site"
-  fi
-elif test "x$MSYSTEM" = "xMINGW32"; then
-  if test -r "${MINGW_PREFIX-/mingw32}/etc/config.site"; then
-    . "${MINGW_PREFIX-/mingw32}/etc/config.site"
-  fi
-elif test "x$MSYSTEM" = "xCLANG64"; then
-  if test -r "${MINGW_PREFIX-/clang64}/etc/config.site"; then
-    . "${MINGW_PREFIX-/clang64}/etc/config.site"
-  fi
-elif test "x$MSYSTEM" = "xCLANG32"; then
-  if test -r "${MINGW_PREFIX-/clang32}/etc/config.site"; then
-    . "${MINGW_PREFIX-/clang32}/etc/config.site"
-  fi
-else
-  # Defaults for MSys2-targeted programs
+# Defaults for MSys2/MinGW64-targeted programs
 
-  # Set proper selfname on bash and fallback to default name on other shells
-  test -n "${BASH_SOURCE}" 2>/dev/null && config_site_me="${BASH_SOURCE[0]##*/}" || config_site_me=config.site
-
-  # Set default 'host' to speedup configure
-  if test -z "$build_alias"; then
-    build_alias="${MSYSTEM_CARCH-x86_64}-pc-msys"  && \
-      ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default build_alias set to $build_alias" >&5
-  fi
-
-  # Set default 'prefix' to "/usr"
-  if ( test -z "$prefix" || test "x$prefix" = "xNONE" ) && \
-     ( test -z "$exec_prefix" || test "x$exec_prefix" = "xNONE" ); then
-    prefix="${MSYSTEM_PREFIX-/usr}" && \
-      ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default prefix set to $prefix" >&5
-  fi
+# Set proper selfname on bash and fallback to default name on other shells
+test -n "${BASH_SOURCE}" 2>/dev/null && config_site_me="${BASH_SOURCE[0]##*/}" || config_site_me=config.site
 
+# Set default 'host' to speedup configure
+if test -z "$build_alias"; then
+  build_alias="${MSYSTEM_CHOST}"  && \
+    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default build_alias set to $build_alias" >&5
 fi
+
+# Set default 'prefix'
+if ( test -z "$prefix" || test "x$prefix" = "xNONE" ) && \
+    ( test -z "$exec_prefix" || test "x$exec_prefix" = "xNONE" ); then
+  prefix="${MSYSTEM_PREFIX}" && \
+    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default prefix set to $prefix" >&5
+fi
\ No newline at end of file
diff --git a/filesystem/mingw32-config.site b/filesystem/mingw32-config.site
deleted file mode 100644
index 0df27312..00000000
--- a/filesystem/mingw32-config.site
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is in public domain.
-# Original author: Karlson2k (Evgeny Grin)
-# Written for MSys2/MinGW64 to help running 'configure' scripts
-
-# Defaults for MinGW64-targeted programs
-
-# Set proper selfname on bash and fallback to default name on other shells
-test -n "${BASH_SOURCE}" 2>/dev/null && config_site_me="${BASH_SOURCE[0]##*/}" || config_site_me=config.site
-
-# Set default 'host' to speedup configure
-if test -z "$build_alias"; then
-  build_alias="${MSYSTEM_CHOST-i686-w64-mingw32}"  && \
-    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default build_alias set to $build_alias" >&5
-fi
-
-# Set default 'prefix' to "/mingw32"
-if ( test -z "$prefix" || test "x$prefix" = "xNONE" ) && \
-   ( test -z "$exec_prefix" || test "x$exec_prefix" = "xNONE" ); then
-  prefix="${MSYSTEM_PREFIX-/mingw32}" && \
-    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default prefix set to $prefix" >&5
-fi
diff --git a/filesystem/mingw64-config.site b/filesystem/mingw64-config.site
deleted file mode 100644
index 47193a7e..00000000
--- a/filesystem/mingw64-config.site
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is in public domain.
-# Original author: Karlson2k (Evgeny Grin)
-# Written for MSys2/MinGW64 to help running 'configure' scripts
-
-# Defaults for MinGW64-targeted programs
-
-# Set proper selfname on bash and fallback to default name on other shells
-test -n "${BASH_SOURCE}" 2>/dev/null && config_site_me="${BASH_SOURCE[0]##*/}" || config_site_me=config.site
-
-# Set default 'host' to speedup configure
-if test -z "$build_alias"; then
-  build_alias="${MSYSTEM_CHOST-x86_64-w64-mingw32}" && \
-    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default build_alias set to $build_alias" >&5
-fi
-
-# Set default 'prefix' to "/mingw64"
-if ( test -z "$prefix" || test "x$prefix" = "xNONE" ) && \
-   ( test -z "$exec_prefix" || test "x$exec_prefix" = "xNONE" ); then
-  prefix="${MSYSTEM_PREFIX-/mingw64}" && \
-    ${as_echo-echo} "$config_site_me:${as_lineno-$LINENO}: default prefix set to $prefix" >&5
-fi
diff --git a/filesystem/msystem b/filesystem/msystem
index a79cb5a0..b62d879c 100644
--- a/filesystem/msystem
+++ b/filesystem/msystem
@@ -20,8 +20,6 @@ unset MINGW_CHOST
 unset MINGW_PREFIX
 unset MINGW_PACKAGE_PREFIX
 
-unset CONFIG_SITE
-
 case "${MSYSTEM}" in
     MINGW32)
         MSYSTEM_PREFIX='/mingw32'
@@ -30,8 +28,7 @@ case "${MSYSTEM}" in
         MINGW_CHOST="${MSYSTEM_CHOST}"
         MINGW_PREFIX="${MSYSTEM_PREFIX}"
         MINGW_PACKAGE_PREFIX="mingw-w64-${MSYSTEM_CARCH}"
-        CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
-        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
+        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
         ;;
     MINGW64)
         MSYSTEM_PREFIX='/mingw64'
@@ -40,8 +37,7 @@ case "${MSYSTEM}" in
         MINGW_CHOST="${MSYSTEM_CHOST}"
         MINGW_PREFIX="${MSYSTEM_PREFIX}"
         MINGW_PACKAGE_PREFIX="mingw-w64-${MSYSTEM_CARCH}"
-        CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
-        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
+        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
         ;;
     CLANG32)
         MSYSTEM_PREFIX='/clang32'
@@ -50,8 +46,7 @@ case "${MSYSTEM}" in
         MINGW_CHOST="${MSYSTEM_CHOST}"
         MINGW_PREFIX="${MSYSTEM_PREFIX}"
         MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
-        CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
-        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
+        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
         ;;
     CLANG64)
         MSYSTEM_PREFIX='/clang64'
@@ -60,14 +55,12 @@ case "${MSYSTEM}" in
         MINGW_CHOST="${MSYSTEM_CHOST}"
         MINGW_PREFIX="${MSYSTEM_PREFIX}"
         MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
-        CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
-        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
+        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
         ;;
     *)
         MSYSTEM_PREFIX='/usr'
         MSYSTEM_CARCH="$(/usr/bin/uname -m)"
         MSYSTEM_CHOST="$(/usr/bin/uname -m)-pc-msys"
-        CONFIG_SITE="/etc/config.site"
-        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST CONFIG_SITE
+        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST
         ;;
 esac