diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua
index 622a6ad4b1dd..fef991296316 100644
--- a/sys/tools/makesyscalls.lua
+++ b/sys/tools/makesyscalls.lua
@@ -60,6 +60,7 @@ local config = {
 	abi_type_suffix = "",
 	abi_flags = "",
 	abi_flags_mask = 0,
+	abi_headers = "",
 	ptr_intptr_t_cast = "intptr_t",
 }
 
@@ -438,6 +439,16 @@ local pattern_table = {
 			write_line_pfile('systrace.*', line)
 		end,
 	},
+	{
+		dump_prevline = true,
+		pattern = "%%ABI_HEADERS%%",
+		process = function()
+			if config['abi_headers'] ~= "" then
+				line = config['abi_headers'] .. "\n"
+				write_line('sysinc', line)
+			end
+		end,
+	},
 	{
 		-- Buffer anything else
 		pattern = ".+",