diff --git a/libraries/cairomm/cairomm.SlackBuild b/libraries/cairomm/cairomm.SlackBuild
old mode 100644
new mode 100755
index 7b13a8691f..b69eb3f0e6
--- a/libraries/cairomm/cairomm.SlackBuild
+++ b/libraries/cairomm/cairomm.SlackBuild
@@ -23,11 +23,20 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cairomm
-VERSION=${VERSION:-1.8.0}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-1.8.4}
 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
@@ -66,15 +78,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --build=$ARCH-slackware-linux
 
-make
-make install-strip DESTDIR=$PKG
+make libdocdir=/usr/doc/$PRGNAM-$VERSION
+make install-strip DESTDIR=$PKG libdocdir=/usr/doc/$PRGNAM-$VERSION
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
-# API reference docs are in here, but we don't need those
-rm -rf $PKG/usr/share/doc
-rmdir $PKG/usr/share
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/cairomm/cairomm.info b/libraries/cairomm/cairomm.info
index 5f23dd2a96..3415e26693 100644
--- a/libraries/cairomm/cairomm.info
+++ b/libraries/cairomm/cairomm.info
@@ -1,8 +1,8 @@
 PRGNAM="cairomm"
-VERSION="1.8.0"
+VERSION="1.8.4"
 HOMEPAGE="http://cairographics.org/cairomm/"
-DOWNLOAD="http://cairographics.org/releases/cairomm-1.8.0.tar.gz"
-MD5SUM="15c0f56eee57bb418c38463a6297d715"
+DOWNLOAD="http://cairographics.org/releases/cairomm-1.8.4.tar.gz"
+MD5SUM="559afbc47484ba3fad265e38a3dafe90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="paul wisehart"
diff --git a/libraries/cairomm/slack-desc b/libraries/cairomm/slack-desc
index 46c9c96585..e9cf37da4c 100644
--- a/libraries/cairomm/slack-desc
+++ b/libraries/cairomm/slack-desc
@@ -11,9 +11,9 @@ cairomm:
 cairomm: cairomm is a C++ wrapper for the cairo graphics library. It offers
 cairomm: all the power of cairo with an interface familiar to C++ developers,
 cairomm: including use of the Standard Template Library where it makes sense.
-cairomm: 
+cairomm:
 cairomm: Homepage: http://cairographics.org/cairomm/
 cairomm:
 cairomm:
-cairomm: 
-cairomm: 
+cairomm:
+cairomm: