diff --git a/desktop/pidgin-libnotify/README b/desktop/pidgin-libnotify/README
index a0fd294424..7c69604c32 100644
--- a/desktop/pidgin-libnotify/README
+++ b/desktop/pidgin-libnotify/README
@@ -2,5 +2,3 @@ This plugin adds a libnotify interface to pidgin, enabling popups much like
 guifications. It has some configuration options, to show popups when a buddy
 signs on, on new messages and on new conversations only.
 Don't forget to enable the plugin in Tools->Plugins.
-
-Requires: libnotify, avalaible at SlackBuilds.org.
diff --git a/desktop/pidgin-libnotify/pidgin-libnotify.SlackBuild b/desktop/pidgin-libnotify/pidgin-libnotify.SlackBuild
index d8300e4051..57f7d51feb 100644
--- a/desktop/pidgin-libnotify/pidgin-libnotify.SlackBuild
+++ b/desktop/pidgin-libnotify/pidgin-libnotify.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=pidgin-libnotify
 VERSION=0.14
-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
@@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e