diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 049ace40b3..4bd89a26b6 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -425,6 +425,11 @@ build_GCC() {
 		--with-pkgversion="coreboot toolchain v$CROSSGCC_VERSION $CROSSGCC_DATE" \
 		|| touch .failed
 	$MAKE $JOBS CFLAGS_FOR_BUILD="$HOSTCFLAGS" all-gcc || touch .failed
+
+	if [ "$(echo ${LANGUAGES} | grep -c '\<ada\>')" -gt 0 ]; then
+		$MAKE $JOBS CFLAGS_FOR_BUILD="$HOSTCFLAGS" -Cgcc/ cross-gnattools || touch .failed
+	fi
+
 	$MAKE install-gcc DESTDIR=$DESTDIR || touch .failed
 
 	if [ "$(echo $TARGETARCH | grep -c -- -mingw32)" -eq 0 ]; then
diff --git a/util/crossgcc/patches/gcc-5.2.0_gnat.patch b/util/crossgcc/patches/gcc-5.2.0_gnat.patch
new file mode 100644
index 0000000000..1e0a5bbbff
--- /dev/null
+++ b/util/crossgcc/patches/gcc-5.2.0_gnat.patch
@@ -0,0 +1,11 @@
+--- gcc-5.2.0/gcc/ada/gcc-interface/Make-lang.in.bak	2015-08-24 16:23:25.004493665 +0200
++++ gcc-5.2.0/gcc/ada/gcc-interface/Make-lang.in	2015-08-24 17:53:52.496636113 +0200
+@@ -45,7 +45,7 @@
+ 
+ 
+ # Extra flags to pass to recursive makes.
+-COMMON_ADAFLAGS= -gnatpg
++COMMON_ADAFLAGS= -gnatpg -gnatwG
+ ifeq ($(TREECHECKING),)
+ CHECKING_ADAFLAGS=
+ else