diff --git a/misc/keychain/keychain.SlackBuild b/misc/keychain/keychain.SlackBuild
index 00df0c5161..b5152a3319 100644
--- a/misc/keychain/keychain.SlackBuild
+++ b/misc/keychain/keychain.SlackBuild
@@ -2,7 +2,7 @@
 # Slackware build script for keychain
 
 # Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
-# Copyright 2014-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -21,10 +21,18 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=keychain
-VERSION=${VERSION:-2.8.2}
+VERSION=${VERSION:-2.8.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-ARCH=noarch
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
diff --git a/misc/keychain/keychain.info b/misc/keychain/keychain.info
index a53bbae3b7..b7eb7aff98 100644
--- a/misc/keychain/keychain.info
+++ b/misc/keychain/keychain.info
@@ -1,8 +1,8 @@
 PRGNAM="keychain"
-VERSION="2.8.2"
+VERSION="2.8.3"
 HOMEPAGE="http://www.funtoo.org/index.php?title=Keychain"
-DOWNLOAD="http://www.funtoo.org/archive/keychain/keychain-2.8.2.tar.bz2"
-MD5SUM="2e1eef5237926086ddf7af497bf49b26"
+DOWNLOAD="http://www.funtoo.org/archive/keychain/keychain-2.8.3.tar.bz2"
+MD5SUM="bdf70a69b8b2208664cfcd4a8e42523b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""