diff --git a/academic/grace/README b/academic/grace/README
index ef2bf3c930..11a339c077 100644
--- a/academic/grace/README
+++ b/academic/grace/README
@@ -10,4 +10,4 @@ calculations or perform automated tasks.
 
 Grace is derived from Xmgr (a.k.a. ACE/gr), originally written by Paul Turner.
 
-This requires netcdf and fftw.
+This requires netcdf.
diff --git a/academic/grace/grace.SlackBuild b/academic/grace/grace.SlackBuild
index 65c6d8c12d..bbe4c74fdb 100644
--- a/academic/grace/grace.SlackBuild
+++ b/academic/grace/grace.SlackBuild
@@ -6,10 +6,19 @@
 
 PRGNAM=grace
 VERSION=5.1.22
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-"_SBo"}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-"/tmp/SBo"}
 PKG=$TMP/package-$PRGNAM
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
     SLKCFLAGS="-O2 -fPIC"
     LIBDIRSUFFIX="64"
+else
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
 fi
 
 set -e