diff --git a/Makefile b/Makefile
index 5d5988a..724259f 100644
--- a/Makefile
+++ b/Makefile
@@ -169,10 +169,10 @@ endif
 
 ifdef QEMU_OLD
 $(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU)/arm-softmmu/libqemu.a
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS)
+	$(CC) -Wl,--no-as-needed $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS)
 else
 $(TARGET): $(OBJS) $(VVFATOBJS) $(X49GP_LIBS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS)
+	$(CC) -Wl,--no-as-needed $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS)
 endif
 
 flash-49g+: $(BOOT49GP) flash-noboot
diff --git a/qemu/qemu-git/configure-small b/qemu/qemu-git/configure-small
index 2f629e4..eb0fd82 100755
--- a/qemu/qemu-git/configure-small
+++ b/qemu/qemu-git/configure-small
@@ -777,9 +777,9 @@ if test -z "$zero_malloc" ; then
     fi
 fi
 
-if test "$werror" = "yes" ; then
-    QEMU_CFLAGS="-Werror $QEMU_CFLAGS"
-fi
+#if test "$werror" = "yes" ; then
+#    QEMU_CFLAGS="-Werror $QEMU_CFLAGS"
+#fi
 
 if test "$solaris" = "no" ; then
     if $ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; then