diff --git a/Makefile.am b/Makefile.am
index 864f433..855f0a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -285,6 +285,7 @@ if WITH_PAX
 ICEDTEA_PATCHES += patches/test_gamma.patch
 endif
 
+ICEDTEA_PATCHES += patches/boot/icedtea-7-disable-werror.patch
 ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
 
 # Bootstrapping patches
diff --git a/patches/boot/icedtea-7-disable-werror.patch b/patches/boot/icedtea-7-disable-werror.patch
new file mode 100644
index 0000000..496f51e
--- /dev/null
+++ b/patches/boot/icedtea-7-disable-werror.patch
@@ -0,0 +1,11 @@
+--- ./openjdk/hotspot/make/linux/makefiles/gcc.make.orig	2012-06-13 11:04:15.253463851 +0200
++++ ./openjdk/hotspot/make/linux/makefiles/gcc.make	2012-06-13 11:04:23.027468365 +0200
+@@ -150,7 +150,7 @@
+ endif
+ 
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++WARNINGS_ARE_ERRORS =
+ 
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit