diff --git a/libraries/cairomm/README b/libraries/cairomm/README
index 19aa411058..85b6a3ae77 100644
--- a/libraries/cairomm/README
+++ b/libraries/cairomm/README
@@ -2,4 +2,5 @@ cairomm is a C++ wrapper for the cairo graphics library. It offers
 all the power of cairo with an interface familiar to C++ developers,
 including use of the Standard Template Library where it makes sense.
 
-This requires glibmm (also available from SlackBuilds.org).
+This requires glibmm, and graphviz is optional.  Both are available 
+from SlackBuilds.org.
diff --git a/libraries/cairomm/cairomm.SlackBuild b/libraries/cairomm/cairomm.SlackBuild
index 6b6f7e7fd3..e9d0806d78 100644
--- a/libraries/cairomm/cairomm.SlackBuild
+++ b/libraries/cairomm/cairomm.SlackBuild
@@ -22,15 +22,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PKGNAME=cairomm
-VERSION=${VERSION:-1.4.8}
+PRGNAM=cairomm
+VERSION=${VERSION:-1.6.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)		
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PKGNAME
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
@@ -39,12 +39,14 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf $PKGNAME-$VERSION
-tar xzf $CWD/$PKGNAME-$VERSION.tar.gz || exit 1
-cd $PKGNAME-$VERSION || exit 1
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xzf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+rw,go-w+r .
 
@@ -54,21 +56,22 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README TODO \
-  $PKG/usr/doc/$PKGNAME-$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
-cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/libraries/cairomm/cairomm.info b/libraries/cairomm/cairomm.info
index 29ddfb8e7c..de84cf6ee9 100644
--- a/libraries/cairomm/cairomm.info
+++ b/libraries/cairomm/cairomm.info
@@ -1,8 +1,8 @@
 PRGNAM="cairomm"
-VERSION="1.4.8"
+VERSION="1.6.4"
 HOMEPAGE="http://cairographics.org/cairomm/"
-DOWNLOAD="http://cairographics.org/releases/cairomm-1.4.8.tar.gz"
-MD5SUM="2b2025b3555fa1665d92cf9f9be1a4d3"
+DOWNLOAD="http://cairographics.org/releases/cairomm-1.6.4.tar.gz"
+MD5SUM="63561c62536173a98f03005dfe55c90e"
 MAINTAINER="paul wisehart"
 EMAIL="wise@lupulin.net"
 APPROVED="rworkman"