diff --git a/dev-libs/expat/expat-2.4.5.recipe b/dev-libs/expat/expat-2.4.6.recipe
similarity index 95%
rename from dev-libs/expat/expat-2.4.5.recipe
rename to dev-libs/expat/expat-2.4.6.recipe
index 73222e703..01b99927c 100644
--- a/dev-libs/expat/expat-2.4.5.recipe
+++ b/dev-libs/expat/expat-2.4.6.recipe
@@ -8,13 +8,13 @@ COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/expat/expat-$portVersion.tar.bz2"
-CHECKSUM_SHA256="fbb430f964c7a2db2626452b6769e6a8d5d23593a453ccbc21701b74deabedff"
+CHECKSUM_SHA256="ce317706b07cae150f90cddd4253f5b4fba929607488af5ac47bf2bc08e31f09"
 PATCHES="expat-$portVersion.patchset"
 
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-libVersion=1.8.5
+libVersion=1.8.6
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 portVersionCompat="$portVersion compat >= 2.2"
 
diff --git a/dev-libs/expat/patches/expat-2.4.5.patchset b/dev-libs/expat/patches/expat-2.4.6.patchset
similarity index 88%
rename from dev-libs/expat/patches/expat-2.4.5.patchset
rename to dev-libs/expat/patches/expat-2.4.6.patchset
index 1120fb817..90819aea5 100644
--- a/dev-libs/expat/patches/expat-2.4.5.patchset
+++ b/dev-libs/expat/patches/expat-2.4.6.patchset
@@ -1,11 +1,11 @@
-From ece0e0b6af5bb07e289f80416fab429fc001fd2b Mon Sep 17 00:00:00 2001
+From ce56d8f8a8c9272791d14e73dd846fbeaa4d47b4 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 24 May 2021 20:59:30 +0200
 Subject: gcc2 build fix
 
 
 diff --git a/lib/xmlparse.c b/lib/xmlparse.c
-index c479a25..8a3649c 100644
+index 7db28d0..0f7f139 100644
 --- a/lib/xmlparse.c
 +++ b/lib/xmlparse.c
 @@ -718,7 +718,8 @@ XML_ParserCreate(const XML_Char *encodingName) {
@@ -152,16 +152,16 @@ index c479a25..8a3649c 100644
    if (! ret)
      return NULL;
  
-@@ -7394,6 +7405,7 @@ build_model(XML_Parser parser) {
-    *   to meet, but that is safe because we get the source index out
-    *   before doing any writes on that node.
+@@ -7414,6 +7425,7 @@ build_model(XML_Parser parser) {
+    *
+    * - The algorithm repeats until all target array indices have been processed.
     */
 +{
    XML_Content *dest = ret; /* tree node writing location, moves upwards */
    XML_Content *const destLimit = &ret[dtd->scaffCount];
-   XML_Content *const stackBottom = &ret[dtd->scaffCount];
-@@ -7439,7 +7451,7 @@ build_model(XML_Parser parser) {
-       }
+   XML_Content *jobDest = ret; /* next free writing location in target array */
+@@ -7454,7 +7466,7 @@ build_model(XML_Parser parser) {
+         (jobDest++)->numchildren = (unsigned int)cn;
      }
    }
 -
@@ -169,7 +169,7 @@ index c479a25..8a3649c 100644
    return ret;
  }
  
-@@ -7511,7 +7523,7 @@ accountingReportStats(XML_Parser originParser, const char *epilog) {
+@@ -7526,7 +7538,7 @@ accountingReportStats(XML_Parser originParser, const char *epilog) {
    if (rootParser->m_accounting.debugLevel < 1) {
      return;
    }
@@ -178,7 +178,7 @@ index c479a25..8a3649c 100644
    const float amplificationFactor
        = accountingGetCurrentAmplification(rootParser);
    fprintf(stderr,
-@@ -7521,6 +7533,7 @@ accountingReportStats(XML_Parser originParser, const char *epilog) {
+@@ -7536,6 +7548,7 @@ accountingReportStats(XML_Parser originParser, const char *epilog) {
            rootParser->m_accounting.countBytesIndirect,
            (double)amplificationFactor, epilog);
  }
@@ -186,7 +186,7 @@ index c479a25..8a3649c 100644
  
  static void
  accountingOnAbort(XML_Parser originParser) {
-@@ -7539,6 +7552,7 @@ accountingReportDiff(XML_Parser rootParser,
+@@ -7554,6 +7567,7 @@ accountingReportDiff(XML_Parser rootParser,
            bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP",
            levelsAwayFromRootParser, source_line, 10, "");
  
@@ -194,7 +194,7 @@ index c479a25..8a3649c 100644
    const char ellipis[] = "[..]";
    const size_t ellipsisLength = sizeof(ellipis) /* because compile-time */ - 1;
    const unsigned int contextLength = 10;
-@@ -7563,6 +7577,7 @@ accountingReportDiff(XML_Parser rootParser,
+@@ -7578,6 +7592,7 @@ accountingReportDiff(XML_Parser rootParser,
    }
    fprintf(stderr, "\"\n");
  }
@@ -202,7 +202,7 @@ index c479a25..8a3649c 100644
  
  static XML_Bool
  accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
-@@ -7581,12 +7596,13 @@ accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
+@@ -7596,12 +7611,13 @@ accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
  
    if (account == XML_ACCOUNT_NONE)
      return XML_TRUE; /* because these bytes have been accounted for, already */
@@ -217,7 +217,7 @@ index c479a25..8a3649c 100644
    const int isDirect
        = (account == XML_ACCOUNT_DIRECT) && (originParser == rootParser);
    const ptrdiff_t bytesMore = after - before;
-@@ -7599,7 +7615,7 @@ accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
+@@ -7614,7 +7630,7 @@ accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
    if (*additionTarget > (XmlBigCount)(-1) - (XmlBigCount)bytesMore)
      return XML_FALSE;
    *additionTarget += bytesMore;
@@ -226,7 +226,7 @@ index c479a25..8a3649c 100644
    const XmlBigCount countBytesOutput
        = rootParser->m_accounting.countBytesDirect
          + rootParser->m_accounting.countBytesIndirect;
-@@ -7618,6 +7634,9 @@ accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
+@@ -7633,6 +7649,9 @@ accountingDiffTolerated(XML_Parser originParser, int tok, const char *before,
  
    return tolerated;
  }
@@ -236,7 +236,7 @@ index c479a25..8a3649c 100644
  
  unsigned long long
  testingAccountingGetCountBytesDirect(XML_Parser parser) {
-@@ -7640,6 +7659,7 @@ entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
+@@ -7655,6 +7674,7 @@ entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
    if (rootParser->m_entity_stats.debugLevel < 1)
      return;
  
@@ -244,7 +244,7 @@ index c479a25..8a3649c 100644
  #  if defined(XML_UNICODE)
    const char *const entityName = "[..]";
  #  else
-@@ -7656,6 +7676,7 @@ entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
+@@ -7671,6 +7691,7 @@ entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
        entity->is_param ? "%" : "&", entityName, action, entity->textLen,
        sourceLine);
  }
@@ -252,7 +252,7 @@ index c479a25..8a3649c 100644
  
  static void
  entityTrackingOnOpen(XML_Parser originParser, ENTITY *entity, int sourceLine) {
-@@ -8226,9 +8247,11 @@ getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
+@@ -8241,9 +8262,11 @@ getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
    if (valueOrNull == NULL) {
      return defaultDebugLevel;
    }
@@ -264,7 +264,7 @@ index c479a25..8a3649c 100644
    char *afterValue = (char *)value;
    unsigned long debugLevel = strtoul(value, &afterValue, 10);
    if ((errno != 0) || (afterValue[0] != '\0')) {
-@@ -8238,3 +8261,5 @@ getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
+@@ -8253,3 +8276,5 @@ getDebugLevel(const char *variableName, unsigned long defaultDebugLevel) {
  
    return debugLevel;
  }