diff --git a/development/cxxtools/cxxtools.SlackBuild b/development/cxxtools/cxxtools.SlackBuild
index 37dc99e772..07e7f5060b 100644
--- a/development/cxxtools/cxxtools.SlackBuild
+++ b/development/cxxtools/cxxtools.SlackBuild
@@ -24,14 +24,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cxxtools
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -49,8 +49,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -75,6 +75,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gcc11.patch
+
+autoreconf -vif
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/development/cxxtools/cxxtools.info b/development/cxxtools/cxxtools.info
index a1b9529e0e..8a80868a55 100644
--- a/development/cxxtools/cxxtools.info
+++ b/development/cxxtools/cxxtools.info
@@ -1,8 +1,8 @@
 PRGNAM="cxxtools"
-VERSION="2.2.1"
+VERSION="3.0"
 HOMEPAGE="http://www.tntnet.org/cxxtools.html"
-DOWNLOAD="http://www.tntnet.org/download/cxxtools-2.2.1.tar.gz"
-MD5SUM="aab00068ae5237435b37ac86f2ac7576"
+DOWNLOAD="https://github.com/maekitalo/cxxtools/archive/V3.0/cxxtools-3.0.tar.gz"
+MD5SUM="cecf596a6987f76cd092fdd94c3ccdde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/cxxtools/gcc11.patch b/development/cxxtools/gcc11.patch
new file mode 100644
index 0000000000..c5516232a4
--- /dev/null
+++ b/development/cxxtools/gcc11.patch
@@ -0,0 +1,25 @@
+From b773c01fc13d2ae67abc0839888e383be23562fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tommi=20M=C3=A4kitalo?= <tommi@tntnet.org>
+Date: Sun, 24 Jan 2021 17:20:24 +0100
+Subject: [PATCH] make cxxtools::Char a trivial class by definining the default
+ constructor as default
+
+---
+ include/cxxtools/char.h | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/include/cxxtools/char.h b/include/cxxtools/char.h
+index 1e637317..3a4ed62a 100644
+--- a/include/cxxtools/char.h
++++ b/include/cxxtools/char.h
+@@ -68,9 +68,7 @@ namespace cxxtools
+             typedef int32_t value_type;
+ 
+             //! Constructs a character with a value of 0.
+-            Char()
+-            : _value(0)
+-            {}
++            Char() = default;
+ 
+             //! Constructs a character using the given value as base for the character value.
+             Char(value_type ch)