diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3416584b..15b7f6f5 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -54,6 +54,8 @@ export SED
 override AWK := @AWK@
 export AWK
 
+CPPFLAGS ?= @CPPFLAGS@
+export CPPFLAGS
 CFLAGS ?= @CFLAGS@
 export CFLAGS
 LDFLAGS ?= @LDFLAGS@
diff --git a/configure.ac b/configure.ac
index e10716aa..21205031 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,7 +186,7 @@ if test "x$NEED_GZIP" = "xyes"; then
     fi
 fi
 
-AC_ARG_VAR(CROSS_TOOLCHAIN, [alternative toolchain prefix (or 'llvm')])
+AC_ARG_VAR(CROSS_TOOLCHAIN, [alternative toolchain prefix for Limine (or 'llvm')])
 AC_ARG_VAR(CROSS_CC, [C compiler command for Limine])
 AC_ARG_VAR(CROSS_LD, [linker command for Limine])
 AC_ARG_VAR(CROSS_OBJCOPY, [objcopy command for Limine])
diff --git a/host/Makefile b/host/Makefile
index 284df24a..c1e3caae 100644
--- a/host/Makefile
+++ b/host/Makefile
@@ -39,7 +39,7 @@ clean:
 	rm -f limine-version limine-version.exe
 
 limine-deploy: limine-deploy.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -std=c99 -D__USE_MINGW_ANSI_STDIO limine-deploy.c -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -std=c99 -D__USE_MINGW_ANSI_STDIO limine-deploy.c -o $@
 
 limine-version: limine-version.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -std=c99 -D__USE_MINGW_ANSI_STDIO limine-version.c -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -std=c99 -D__USE_MINGW_ANSI_STDIO limine-version.c -o $@