diff --git a/configure b/configure
index 09c400a..4d25e9e 100755
--- a/configure
+++ b/configure
@@ -985,6 +985,10 @@ elif test "$target_cpu" = "ppc" ; then
     echo "TARGET_ARCH=ppc" >> $config_mak
     echo "#define TARGET_ARCH \"ppc\"" >> $config_h
     echo "#define TARGET_PPC 1" >> $config_h
+elif test "$target_cpu" = "arm" ; then
+    echo "TARGET_ARCH=arm" >> $config_mak
+    echo "#define TARGET_ARCH \"arm\"" >> $config_h
+    echo "#define TARGET_ARM 1" >> $config_h
 else
     echo "Unsupported target CPU"
     exit 1
diff --git a/src/npw-viewer.sh b/src/npw-viewer.sh
index 34f83b6..3db01b3 100644
--- a/src/npw-viewer.sh
+++ b/src/npw-viewer.sh
@@ -117,6 +117,17 @@ if test "$ARCH" != "$TARGET_ARCH"; then
 	    NPW_USE_XSHM="no"
 	fi
 	;;
+    arm)
+        if test "$ARCH" = "arm"; then
+	    case "$OS" in
+	    linux)
+		LOADER=`which linux32`
+		;;
+            esac
+	else
+	    LOADER=`which qemu-arm`
+	    NPW_USE_XSHM="no"
+	fi
     esac
     if test "$LOADER" = "none"; then
 	unset LOADER