diff --git a/parts.rst b/parts.rst
index b6a90b9..aaa40ff 100644
--- a/parts.rst
+++ b/parts.rst
@@ -100,7 +100,7 @@ using older versions compilable by tinycc. Prior to this point, all tools
 have been adapted significantly for the bootstrap; now, we will be using
 old tooling instead.
 
-make 3.80
+make 3.82
 =========
 
 GNU ``make`` is now built so we have a more robust building system.
@@ -535,9 +535,8 @@ that we do not have available.
 make 3.82
 =========
 
-GNU Make is updated by .02. The most notable thing is this is now built properly
-using the build system and GCC, which means that it does not randomly segfault
-while building the Linux kernel.
+GNU ``make`` is now rebuilt properly using the build system and GCC, which means that
+it does not randomly segfault while building the Linux kernel.
 
 kexec-tools 2.0.22
 ==================
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 3d34147..440c90f 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -99,7 +99,7 @@ f3be04bb46c9ac80180defa46c274214ab00b5b4dd9c8a3a6de162e43ef0fa20  tar-1.34_0.tar
 db57c6ef39965f0562d2aefe3c06571df50ba1265446d97f2714d80518862cef  tcc-0.9.27_2.tar.bz2
 e2014b844b1a79cda9142a38af0404efd242ae02f77aa286c968e4ad6ad87265  tcc-0.9.27_3.tar.bz2
 0c8b02693dac9483d845e7754919fdf21e97d695e5de13893c1356d0a9c22946  texinfo-6.7_0.tar.bz2
-bf4a6be34cda165e4c206e852ccc09387f5ae8ea7db6de2db01297cabfa1a486  util-linux-2.19.1_0.tar.bz2
+e3fb8277bec3c93887029d51aea1c53216fee41b8e5be5ff447da1cf543641c6  util-linux-2.19.1_0.tar.bz2
 284d176b39312795bf155b794fc3c02070ff788d19307e926429fa3299faf283  which-2.21_0.tar.bz2
 e900a8b70f49bfcbb7a48bd27e2de67c30454d693b6f35dcdfadd35570e98e69  xz-5.0.5_0.tar.bz2
 068fcf87574883b29734bda3ccc45ef0e2be7aa6fb7e86941c78eb5a4de61389  zlib-1.2.13_0.tar.bz2
diff --git a/sysa/make-3.80/make-3.80.checksums b/sysa/make-3.80/make-3.80.checksums
deleted file mode 100644
index be626d0..0000000
--- a/sysa/make-3.80/make-3.80.checksums
+++ /dev/null
@@ -1 +0,0 @@
-8112529259780fe659ba68030d1ba1a64589ece80d0f328523395029827bd41f  /usr/bin/make
diff --git a/sysa/make-3.80/sources b/sysa/make-3.80/sources
deleted file mode 100644
index faf7061..0000000
--- a/sysa/make-3.80/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://mirrors.kernel.org/gnu/make/make-3.80.tar.bz2 a99b39e7b04c333724f48c38fede709481cfb69fafe7e32ae4285b7fadf92f1b
diff --git a/sysa/make-3.82/files/putenv_stub.c b/sysa/make-3.82/files/putenv_stub.c
new file mode 100644
index 0000000..4813510
--- /dev/null
+++ b/sysa/make-3.82/files/putenv_stub.c
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Paul Dersey <pdersey@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+int putenv(char *string)
+{
+    return 0;
+}
+
diff --git a/sysa/make-3.82/make-3.82.checksums b/sysa/make-3.82/make-3.82.checksums
new file mode 100644
index 0000000..9cbe2eb
--- /dev/null
+++ b/sysa/make-3.82/make-3.82.checksums
@@ -0,0 +1 @@
+a7de9406e3adf34577628447696020944f7961d8a9da32c0da930316a05d0710  /usr/bin/make
diff --git a/sysa/make-3.80/make-3.80.kaem b/sysa/make-3.82/make-3.82.kaem
similarity index 86%
rename from sysa/make-3.80/make-3.80.kaem
rename to sysa/make-3.82/make-3.82.kaem
index b156756..e25baf4 100755
--- a/sysa/make-3.80/make-3.80.kaem
+++ b/sysa/make-3.82/make-3.82.kaem
@@ -22,6 +22,9 @@ cd ${pkg}
 # Create .h files
 catm config.h
 
+# Prepare
+cp ../../files/putenv_stub.c putenv_stub.c
+
 # Compile
 tcc -c getopt.c
 tcc -c getopt1.c
@@ -36,22 +39,24 @@ tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -Dvfork=fork function.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART implicit.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_DUP2 -DHAVE_STRCHR -Dvfork=fork job.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DLOCALEDIR=\"/fake-locale\" -DPACKAGE=\"fake-make\" -DHAVE_MKTEMP -DHAVE_GETCWD main.c
-tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_STRERROR -DHAVE_VPRINTF misc.c
+tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DHAVE_STRERROR -DHAVE_VPRINTF -DHAVE_ANSI_COMPILER -DHAVE_STDARG_H misc.c
 tcc -c -I. -Iglob -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DINCLUDEDIR=\"${PREFIX}/include\" read.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART -DFILE_TIMESTAMP_HI_RES=0 -DHAVE_FCNTL_H -DLIBDIR=\"${PREFIX}/lib\" remake.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART rule.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART signame.c
+tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART strcache.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART variable.c
-tcc -c -I. -DVERSION=\"3.80\" version.c
+tcc -c -I. -DVERSION=\"3.82\" version.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART vpath.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART hash.c
 tcc -c -I. -DHAVE_INTTYPES_H -DHAVE_SA_RESTART remote-stub.c
 tcc -c -DHAVE_FCNTL_H getloadavg.c
 tcc -c -Iglob -DSTDC_HEADERS glob/fnmatch.c
 tcc -c -Iglob -DHAVE_STRDUP -DHAVE_DIRENT_H glob/glob.c
+tcc -c putenv_stub.c
 
 # Link
-tcc -static -o ${bindir}/make getopt.o getopt1.o ar.o arscan.o commands.o default.o dir.o expand.o file.o function.o implicit.o job.o main.o misc.o read.o remake.o rule.o signame.o variable.o version.o vpath.o hash.o remote-stub.o getloadavg.o fnmatch.o glob.o
+tcc -static -o ${bindir}/make getopt.o getopt1.o ar.o arscan.o commands.o default.o dir.o expand.o file.o function.o implicit.o job.o main.o misc.o read.o remake.o rule.o signame.o strcache.o variable.o version.o vpath.o hash.o remote-stub.o getloadavg.o fnmatch.o glob.o putenv_stub.o
 
 # Test
 make --version
diff --git a/sysa/run.kaem b/sysa/run.kaem
index 48baafc..060d844 100755
--- a/sysa/run.kaem
+++ b/sysa/run.kaem
@@ -43,7 +43,7 @@ kaem --file ${pkg}.kaem
 cd ..
 
 # make
-pkg="make-3.80"
+pkg="make-3.82"
 cd ${pkg}
 kaem --file ${pkg}.kaem
 cd ..