diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index b51d2fcc..e65872aa 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -37,6 +37,7 @@ bc79b890f35ca38d66ff89a6e3758226131e51ccbd10ef78d5ff150b7bd73689  flex-2.5.11.ta
 c40385e142989c91989413f3c5a31282b2ffdca16b69cd3ecfde537b8a474921  flex-2.5.33.tar.gz
 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995  flex-2.6.4.tar.gz
 5cc35def1ff4375a8b9a98c2ff79e95e80987d24f0d42fdbb7b7039b3ddb3fb0  gawk-3.0.4.tar.gz
+436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d  gc-8.0.4.tar.gz
 e9bf58c761a4f988311aef6b41f12fd5c7e51d09477468fb73826aecc1be32e7  gcc-4.0.4.tar.bz2
 92e61c6dc3a0a449e62d72a38185fda550168a86702dea07125ebd3ec3996282  gcc-4.7.4.tar.bz2
 d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192  gettext-0.21.tar.xz
diff --git a/parts.rst b/parts.rst
index 59830de4..08471522 100644
--- a/parts.rst
+++ b/parts.rst
@@ -712,3 +712,9 @@ libatomic_ops 7.6.10
 
 ``libatomic_ops`` provides semi-portable access to hardware-provided atomic memory
 update operations on a number of architectures.
+
+boehm-gc 8.0.4
+==============
+
+The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage
+collecting replacement for C malloc or C++ new.
diff --git a/sysa.py b/sysa.py
index 55da9a96..d66b2083 100755
--- a/sysa.py
+++ b/sysa.py
@@ -467,3 +467,6 @@ class SysA:
 
         # libatomic_ops 7.6.10
         self.get_file("https://github.com/ivmai/libatomic_ops/releases/download/v7.6.10/libatomic_ops-7.6.10.tar.gz")
+
+        # boehm-gc 8.0.4
+        self.get_file("https://www.hboehm.info/gc/gc_source/gc-8.0.4.tar.gz")
diff --git a/sysa/gc-8.0.4/checksums b/sysa/gc-8.0.4/checksums
new file mode 100644
index 00000000..f217a23f
--- /dev/null
+++ b/sysa/gc-8.0.4/checksums
@@ -0,0 +1,4 @@
+f1ca817287c87477222ad3c58934490cdf03acb24daa9e694a99bf01fa8b7179  /image/lib/musl/libcord.a
+d9748a0b9e5723fec11b0ce7bac16733ae5eaa1389f7f92ca979a4427bc9ecb9  /image/lib/musl/libcord.la
+a4ad4d29dece9854a5d64b7be4e9bea4c156494f3ab02ee481f67c65b32f2ca0  /image/lib/musl/libgc.a
+c7d6f2d93ef3b31a4f512619e04719a21509461defe666fde66c67d3b3972c4c  /image/lib/musl/libgc.la
diff --git a/sysa/gc-8.0.4/gc-8.0.4.sh b/sysa/gc-8.0.4/gc-8.0.4.sh
new file mode 100755
index 00000000..0130b1aa
--- /dev/null
+++ b/sysa/gc-8.0.4/gc-8.0.4.sh
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    autoreconf-2.69 -fi
+}
+
+src_configure() {
+    # CFLAGS needed on musl
+    ./configure \
+        --prefix="${PREFIX}" \
+        --build=i386-unknown-linux-gnu \
+        --host=i386-unknown-linux-gnu \
+        --target=i386-unknown-linux-gnu \
+        --libdir="${PREFIX}/lib/musl" \
+        --disable-shared \
+        CFLAGS='-D_GNU_SOURCE -DNO_GETCONTEXT -DSEARCH_FOR_DATA_START -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR'
+}
diff --git a/sysa/run2.sh b/sysa/run2.sh
index 23e323e1..2ab72802 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -68,6 +68,8 @@ build libffi-3.3
 
 build libatomic_ops-7.6.10
 
+build gc-8.0.4
+
 if [ "$FORCE_TIMESTAMPS" = True ] ; then
     echo 'Forcing all files timestamps to be 0 unix time.'
     canonicalise_all_files_timestamp