diff --git a/recipes-bsp/u-boot/u-boot-sunxi.bb b/recipes-bsp/u-boot/u-boot-sunxi.bb
index e5e63ec..eb6a3fa 100644
--- a/recipes-bsp/u-boot/u-boot-sunxi.bb
+++ b/recipes-bsp/u-boot/u-boot-sunxi.bb
@@ -20,8 +20,9 @@ UBOOT_MACHINE_meleg = "Mele_A1000G_config"
 
 SRC_URI = " \
 	git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \
-	file://0002-gcc5-fixes.patch \
-	file://0003-gcc6-fixes.patch \
+	file://0001-gcc5-fixes.patch \
+	file://0002-gcc6-fixes.patch \
+	file://0003-No-gcc-version-specific-includes.patch \
 	"
 
 PE = "1"
diff --git a/recipes-bsp/u-boot/u-boot-sunxi/0002-gcc5-fixes.patch b/recipes-bsp/u-boot/u-boot-sunxi/0001-gcc5-fixes.patch
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-sunxi/0002-gcc5-fixes.patch
rename to recipes-bsp/u-boot/u-boot-sunxi/0001-gcc5-fixes.patch
diff --git a/recipes-bsp/u-boot/u-boot-sunxi/0003-gcc6-fixes.patch b/recipes-bsp/u-boot/u-boot-sunxi/0002-gcc6-fixes.patch
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-sunxi/0003-gcc6-fixes.patch
rename to recipes-bsp/u-boot/u-boot-sunxi/0002-gcc6-fixes.patch
diff --git a/recipes-bsp/u-boot/u-boot-sunxi/0003-No-gcc-version-specific-includes.patch b/recipes-bsp/u-boot/u-boot-sunxi/0003-No-gcc-version-specific-includes.patch
new file mode 100644
index 0000000..c0a756f
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-sunxi/0003-No-gcc-version-specific-includes.patch
@@ -0,0 +1,24 @@
+From bc4aa5814cbedbfaa1c79dfe7ea2571fee7f2d51 Mon Sep 17 00:00:00 2001
+From: Andrey Lebedev <andrey@lebedev.lt>
+Date: Wed, 22 Jan 2020 20:00:11 +0200
+Subject: [PATCH] No gcc version-specific includes
+
+In order to support gcc-5 and above. Fixes compilation errors like
+
+linux/compiler-gcc9.h: No such file or directory
+---
+ include/linux/compiler-gcc.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
+index 9896e547b9..5f0bd65f3a 100644
+--- a/include/linux/compiler-gcc.h
++++ b/include/linux/compiler-gcc.h
+@@ -90,4 +90,3 @@
+ #define __gcc_header(x) #x
+ #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
+ #define gcc_header(x) _gcc_header(x)
+-#include gcc_header(__GNUC__)
+-- 
+2.20.1
+