diff --git a/Makefile.target b/Makefile.target
index 68563299e7..78e3e7f106 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -188,7 +188,7 @@ OP_CFLAGS=$(CFLAGS)
 endif
 
 ifeq ($(ARCH),arm)
-OP_CFLAGS=$(CFLAGS) -mno-sched-prolog
+OP_CFLAGS=$(CFLAGS) -mno-sched-prolog -fno-omit-frame-pointer
 LDFLAGS+=-Wl,-T,$(SRC_PATH)/arm.ld
 endif
 
diff --git a/configure b/configure
index e9978276d3..70da7add05 100755
--- a/configure
+++ b/configure
@@ -32,10 +32,10 @@ case "$cpu" in
   i386|i486|i586|i686|i86pc|BePC)
     cpu="i386"
   ;;
-  armv4b)
+  armv*b)
     cpu="armv4b"
   ;;
-  armv4l)
+  armv*l)
     cpu="armv4l"
   ;;
   alpha)