3 files changed, 15 insertions, 3 deletions
diff --git a/network/claws-mail/README b/network/claws-mail/README
index 5ab56d3f9e..21b7443c69 100644
--- a/network/claws-mail/README
+++ b/network/claws-mail/README
@@ -17,4 +17,4 @@ any other email client, and export them just as easily.
 Lots of extra functionality, like an RSS aggregator, calendar, or laptop LED
 handling, are provided by extra plugins.
 
-* libetpan is required for IMAP support; it can be found at slackbuilds.org
+This requires libetpan if you want IMAP support.
diff --git a/network/claws-mail/claws-mail.SlackBuild b/network/claws-mail/claws-mail.SlackBuild
index 9c62b20df4..a3ce2d2b07 100644
--- a/network/claws-mail/claws-mail.SlackBuild
+++ b/network/claws-mail/claws-mail.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=claws-mail
 VERSION=3.7.6
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -eu
diff --git a/network/claws-mail/slack-desc b/network/claws-mail/slack-desc
index 74c0d40211..fc86ebdbd3 100644
--- a/network/claws-mail/slack-desc
+++ b/network/claws-mail/slack-desc
@@ -7,7 +7,7 @@
 
           |-----handy-ruler------------------------------------------------------|
 claws-mail: Claws-Mail (A user-friendly, lightweight, and fast email cleint)
-claws-mail: 
+claws-mail:
 claws-mail: Claws Mail is an email client (and news reader), based on GTK+,
 claws-mail: featuring: Quick response, Graceful, and sophisticated interface,
 claws-mail: Easy configuration, intuitive operation, Abundant features, and