diff --git a/clisp-2.49-configure.dif b/clisp-2.49-configure.dif
index 7c1b270..1a33089 100644
--- a/clisp-2.49-configure.dif
+++ b/clisp-2.49-configure.dif
@@ -95,15 +95,6 @@
  
  test "${verbose}" = true -o "${verbose}" = yes && \
    cat <<EOF >&2
-@@ -1337,7 +1342,7 @@ if [ $XCC_GCC = true ] ; then
-     fi
-     # For platforms that use global register variables...
-     case "$cpu" in
--      m68k | i386 | sparc | sparc64 | hppa | arm | armhf | alpha | s390*)
-+      m68k | i386 | sparc | sparc64 | hppa | arm | armhf | armel | alpha | s390*)
-         if [ $CROSS = false ] ; then
-           case "$XCC_GCC_VERSION" in
-             3.1*)
 @@ -1384,6 +1389,9 @@ if [ $XCC_GCC = true ] ; then
      XCFLAGS=${XCFLAGS}" -pthread"
    fi
@@ -114,24 +105,6 @@
  else
  
    if [ $CROSS = false ] ; then
-@@ -1605,7 +1613,7 @@ else
-         ;;
- 
-       # Linux/arm
--      linux*--arm | linux*--armhf)
-+      linux*--arm | linux*--armhf | linux*--armel)
-         XCFLAGS="$XCFLAGS -DNO_ASM"
-         ;;
- 
-@@ -2109,7 +2117,7 @@ case " ${XCPPFLAGS} ${XCFLAGS} " in
-       ARI_ASMD=$ARI_ASMD' ari_asm_hppa'
-       ARI_ASMS=$ARI_ASMS' ari_asm_hppa'
-     fi
--    if [ "$cpu" = arm -o "$cpu" = armhf ] ; then
-+    if [ "$cpu" = arm -o "$cpu" = armhf -o "$cpu" = armel ] ; then
-       ARI_ASMD=$ARI_ASMD' ari_asm_arm'
-       ARI_ASMS=$ARI_ASMS' ari_asm_arm'
-     fi
 @@ -4105,8 +4113,9 @@ if [ $CROSS = false ] ; then
      echol
      if [ "${with_dynamic_modules}" != no ]; then
diff --git a/clisp.spec b/clisp.spec
index 9eab06d..c2c456c 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -184,8 +184,7 @@ port=''
 case "$(uname -m)" in
     i[0-9]86)
             MYCFLAGS="${MYCFLAGS}"				;;
-    arm*)   MYCFLAGS="${MYCFLAGS}"
-	    port=--enable-portability				;;
+    arm*)   MYCFLAGS="${MYCFLAGS} ${safety}"			;;
     aarch64)MYCFLAGS="${MYCFLAGS} -DSAFETY=3"			;;
     ppc)    MYCFLAGS="${MYCFLAGS}"				;;
     s390)   MYCFLAGS="${MYCFLAGS}"				;;
@@ -193,7 +192,7 @@ case "$(uname -m)" in
     sparc*) MYCFLAGS="${MYCFLAGS} ${safety}"			;;
     ppc64)  MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"	;;
     ppc64le)MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"	;;
-    s390x)  MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"
+    s390x)  MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD -DSAFETY=3"
 	    port=--enable-portability				;;
     ia64)   MYCFLAGS="${MYCFLAGS} ${safety}"			;;
     axp|alpha)