diff --git a/system/kerneloops/README b/system/kerneloops/README
index 69b4eb0028..05981c0976 100644
--- a/system/kerneloops/README
+++ b/system/kerneloops/README
@@ -4,5 +4,3 @@ This package contains the tools to collect kernel crash signatures,
 and to submit them to the kerneloops.org website where the kernel
 crash signatures get collected and grouped for presentation to the
 Linux kernel developers.
-
-This requires libnotify, which is also available from SlackBuilds.org.
diff --git a/system/kerneloops/kerneloops.SlackBuild b/system/kerneloops/kerneloops.SlackBuild
index cb441360dc..e914dd9e25 100644
--- a/system/kerneloops/kerneloops.SlackBuild
+++ b/system/kerneloops/kerneloops.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kerneloops
 
-# Copyright 2008-2009  Robby Workman, Northport, Alabama, USA
+# Copyright 2008,2009,2010  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
 
 PRGNAM=kerneloops
 VERSION=0.12
-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 -e