diff -Naur qemu-arm-1207.old/configure qemu-arm-1207.new/configure
--- qemu-arm-1207.old/configure	2007-12-10 10:50:14.000000000 +0200
+++ qemu-arm-1207.new/configure	2007-12-12 12:28:50.000000000 +0200
@@ -317,10 +317,10 @@
   ;;
   --disable-werror) werror="no"
   ;;
-  *) echo "ERROR: unknown option $opt"; show_help="yes"
-  ;;
   --disable-nptl) nptl="no"
   ;;
+  *) echo "ERROR: unknown option $opt"; show_help="yes"
+  ;;
   esac
 done
 
diff -Naur qemu-arm-1207.old/linux-user/main.c qemu-arm-1207.new/linux-user/main.c
--- qemu-arm-1207.old/linux-user/main.c	2007-12-10 10:49:34.000000000 +0200
+++ qemu-arm-1207.new/linux-user/main.c	2007-12-12 12:29:23.000000000 +0200
@@ -2030,7 +2030,8 @@
            "-L path           set the elf interpreter prefix (default=%s)\n"
            "-s size           set the stack size in bytes (default=%ld)\n"
            "-cpu model        select CPU (-cpu ? for list)\n"
-           "-drop-ld-preload  drop LD_PRELOAD for target process\n"
+           "-keep-ld-preload  preserve LD_PRELOAD for target process\n"
+           "-drop-ld-preload  drop LD_PRELOAD for target process (default)\n"
            "\n"
            "debug options:\n"
            "-d options   activate log (logfile=%s)\n"
@@ -2136,6 +2137,8 @@
             }
         } else if (!strcmp(r, "drop-ld-preload")) {
             drop_ld_preload = 1;
+        } else if (!strcmp(r, "keep-ld-preload")) {
+            drop_ld_preload = 0;
         } else if (!strcmp(r, "strace")) {
             do_strace = 1;
         } else
diff -Naur qemu-arm-1207.old/Makefile.target qemu-arm-1207.new/Makefile.target
--- qemu-arm-1207.old/Makefile.target	2007-12-10 10:50:14.000000000 +0200
+++ qemu-arm-1207.new/Makefile.target	2007-12-12 12:43:38.000000000 +0200
@@ -261,6 +261,10 @@
 ifdef CONFIG_LINUX_USER
 OBJS= main.o syscall.o strace.o mmap.o signal.o path.o osdep.o thunk.o \
       elfload.o linuxload.o uaccess.o
+ifeq ($(TARGET_ARCH), arm)
+# Enable scratchbox for arm-linux-user, adding libs at the beginning of list
+LIBS+=-L/scratchbox/tools/lib -lsb -ldl
+endif
 LIBS+= $(AIOLIBS)
 ifdef TARGET_HAS_BFLT
 OBJS+= flatload.o