diff --git a/Makefile b/Makefile
index 6b5ff6e..9a24991 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ CC += $(shell if [ "`uname -m`" = "sparc64" -o "`uname -m`" = "sun4u" ]; then ec
 
 COCOA_LIBS=$(shell if [ "`uname -s`" = "Darwin" ]; then echo "-F/System/Library/Frameworks -framework Cocoa -framework IOKit"; fi)
 
-X49GP_CFLAGS = -O2 -Wall -Werror $(DEBUG) $(INCLUDES) $(DEFINES)
+X49GP_CFLAGS = -O2 -Wall -Werror $(DEBUG) $(INCLUDES) $(DEFINES) -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=array-bounds
 X49GP_LDFLAGS += $(DEBUG) $(GDB_LDFLAGS)
 X49GP_LDLIBS = $(X49GP_LIBS) $(GDB_LIBS) $(COCOA_LIBS)
 
diff --git a/qemu/qemu-git/configure-small b/qemu/qemu-git/configure-small
index 2f629e4..989e40e 100755
--- a/qemu/qemu-git/configure-small
+++ b/qemu/qemu-git/configure-small
@@ -81,7 +81,7 @@ ar="${cross_prefix}${ar}"
 ld="${cross_prefix}${ld}"
 
 # default flags for all hosts
-QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
+QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS -Wno-error=array-bounds"
 CFLAGS="-g $CFLAGS"
 QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
 QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
@@ -96,7 +96,7 @@ int main(void) { }
 EOF
 for flag in $gcc_flags; do
     if compile_prog "$QEMU_CFLAGS" "$flag" ; then
-	QEMU_CFLAGS="$flag $QEMU_CFLAGS"
+        QEMU_CFLAGS="$flag $QEMU_CFLAGS"
     fi
 done
 
@@ -771,9 +771,9 @@ fi
 # enable/disable
 if test -z "$zero_malloc" ; then
     if test "$z_version" = "50" ; then
-	zero_malloc="no"
+        zero_malloc="no"
     else
-	zero_malloc="yes"
+        zero_malloc="yes"
     fi
 fi