diff --git a/Makefile.inc b/Makefile.inc
index 656d988668..d4748fc866 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -424,12 +424,15 @@ gitconfig:
 	git config remote.origin.push HEAD:refs/for/master
 	(git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1)
 
-crossgcc: crossgcc-i386 crossgcc-arm crossgcc-aarch64 crossgcc-mips crossgcc-riscv
+crossgcc: crossgcc-i386 crossgcc-x64 crossgcc-arm crossgcc-aarch64 crossgcc-mips crossgcc-riscv
 
-.PHONY: crossgcc-i386 crossgcc-arm crossgcc-aarch64 crossgcc-mips crossgcc-riscv
+.PHONY: crossgcc-i386 crossgcc-x64 crossgcc-arm crossgcc-aarch64 crossgcc-mips crossgcc-riscv
 crossgcc-i386: clean-for-update
 	$(MAKE) -C util/crossgcc build-i386-without-gdb
 
+crossgcc-x64: clean-for-update
+	$(MAKE) -C util/crossgcc build-x64-without-gdb
+
 crossgcc-arm: clean-for-update
 	$(MAKE) -C util/crossgcc build-armv7a-without-gdb
 
@@ -442,12 +445,15 @@ crossgcc-mips: clean-for-update
 crossgcc-riscv: clean-for-update
 	$(MAKE) -C util/crossgcc build-riscv-without-gdb
 
-crosstools: crosstools-i386 crosstools-arm crosstools-aarch64 crosstools-mips crosstools-riscv
+crosstools: crosstools-i386 crosstools-x64 crosstools-arm crosstools-aarch64 crosstools-mips crosstools-riscv
 
-.PHONY: crosstools-i386 crosstools-arm crosstools-aarch64 crosstools-mips crosstools-riscv
+.PHONY: crosstools-i386 crosstools-x64 crosstools-arm crosstools-aarch64 crosstools-mips crosstools-riscv
 crosstools-i386: clean-for-update
 	$(MAKE) -C util/crossgcc build-i386
 
+crosstools-x64: clean-for-update
+	$(MAKE) -C util/crossgcc build-x64
+
 crosstools-arm: clean-for-update
 	$(MAKE) -C util/crossgcc build-armv7a
 
diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile
index 2d344e345d..2f18b17ac7 100644
--- a/util/crossgcc/Makefile
+++ b/util/crossgcc/Makefile
@@ -1,8 +1,11 @@
-all: build-i386 build-armv7a build-aarch64 build-mips build-riscv
+all: build-i386 build-x64 build-armv7a build-aarch64 build-mips build-riscv
 
 build-i386:
 	bash ./buildgcc -G -p i386-elf
 
+build-x64:
+	bash ./buildgcc -G -p x86_64-elf
+
 build-armv7a:
 	bash ./buildgcc -G -p armv7a-eabi
 
@@ -19,6 +22,10 @@ build-riscv:
 build-i386-without-gdb:
 	bash ./buildgcc -p i386-elf
 
+.PHONY: build-x64-without-gdb
+build-x64-without-gdb:
+	bash ./buildgcc -p x86_64-elf
+
 .PHONY: build-armv7a-without-gdb
 build-armv7a-without-gdb:
 	bash ./buildgcc -p armv7a-eabi
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 7221b8326a..ceb1d1d4f1 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -232,6 +232,8 @@ while true ; do
 done
 
 case "$TARGETARCH" in
+	x86_64-elf)	;;
+	x86_64*)	TARGETARCH=x86_64-elf;;
 	i386-elf)	;;
 	i386-mingw32)	;;
 	mipsel-elf)	;;