:: commit 6275457af062261c1b4e4e93a0860291719abb7c

diff --git a/Makefile b/Makefile
index 4582a686..ff79a0c3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ PATH := $(shell pwd)/toolchain/bin:$(PATH)
 
 NCPUS := $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1)
 
-TOOLCHAIN = x86_64-elf
+TOOLCHAIN = limine
 
 TOOLCHAIN_CC = $(TOOLCHAIN)-gcc
 
diff --git a/README.md b/README.md
index 0148c352..1caa5156 100644
--- a/README.md
+++ b/README.md
@@ -101,8 +101,8 @@ make    # (or gmake where applicable)
 
 It is possible to pass `make` additional flags, most relevantly,
 `TOOLCHAIN=`, which allows one to specify an alternative toolchain for the build
-system to use (the default is `x86_64-elf`, falling back to no-triple, or host,
-toolchain).
+system to use (the default is `limine`, resulting in program names like `limine-gcc`,
+falling back to no-prefix, or host, toolchain).
 
 The generated bootloader files are going to be in `bin`.
 
diff --git a/aux/make_toolchain.sh b/aux/make_toolchain.sh
index 9b82aa88..bce69753 100755
--- a/aux/make_toolchain.sh
+++ b/aux/make_toolchain.sh
@@ -38,7 +38,7 @@ tar -zxf ../gcc-$GCCVERSION.tar.gz
 
 mkdir build-binutils
 cd build-binutils
-../binutils-$BINUTILSVERSION/configure CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS"  --target=$TARGET --prefix="$PREFIX" --with-sysroot --disable-nls --disable-werror --enable-targets=x86_64-elf,x86_64-pe
+../binutils-$BINUTILSVERSION/configure CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS"  --target=$TARGET --prefix="$PREFIX" --program-prefix=limine- --with-sysroot --disable-nls --disable-werror --enable-targets=x86_64-elf,x86_64-pe
 $MAKE
 $MAKE install
 cd ..
@@ -48,7 +48,7 @@ contrib/download_prerequisites
 cd ..
 mkdir build-gcc
 cd build-gcc
-../gcc-$GCCVERSION/configure CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" --target=$TARGET --prefix="$PREFIX" --disable-nls --enable-languages=c --without-headers
+../gcc-$GCCVERSION/configure CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" --target=$TARGET --prefix="$PREFIX" --program-prefix=limine- --disable-nls --enable-languages=c --without-headers
 $MAKE all-gcc
 $MAKE all-target-libgcc
 $MAKE install-gcc
diff --git a/decompressor/Makefile b/decompressor/Makefile
index 26cfc788..d9cb8fe1 100644
--- a/decompressor/Makefile
+++ b/decompressor/Makefile
@@ -4,7 +4,7 @@ ifeq ($(BUILDDIR), )
 	$(error BUILDDIR not specified)
 endif
 
-TOOLCHAIN = x86_64-elf
+TOOLCHAIN = limine
 
 TOOLCHAIN_CC = $(TOOLCHAIN)-gcc
 TOOLCHAIN_LD = $(TOOLCHAIN)-ld
diff --git a/stage23/Makefile b/stage23/Makefile
index 752fe19b..c04d79d2 100644
--- a/stage23/Makefile
+++ b/stage23/Makefile
@@ -15,7 +15,7 @@ else
 	$(error Invalid target)
 endif
 
-TOOLCHAIN = x86_64-elf
+TOOLCHAIN = limine
 
 TOOLCHAIN_CC = $(TOOLCHAIN)-gcc
 TOOLCHAIN_LD = $(TOOLCHAIN)-ld