diff --git a/libraries/exiv2/README b/libraries/exiv2/README
index 6ef6e3afe1..8b7d19e9a5 100644
--- a/libraries/exiv2/README
+++ b/libraries/exiv2/README
@@ -1,2 +1,2 @@
-Exiv2 is a C++ library and a command line utility to read
-and write Exif and IPTC image metadata.
+Exiv2 is a C++ library and a command line utility to read and write
+Exif and IPTC image metadata.
diff --git a/libraries/exiv2/exiv2.SlackBuild b/libraries/exiv2/exiv2.SlackBuild
index 24de58f46b..390f4c3525 100644
--- a/libraries/exiv2/exiv2.SlackBuild
+++ b/libraries/exiv2/exiv2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Exiv2
 
-# Copyright 2007-2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
+# Copyright 2007-2009  Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exiv2
-VERSION=0.17.1
+VERSION=${VERSION:-0.18.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,8 +33,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="COPYING README doc/ChangeLog doc/COPYING-XMPSDK doc/README-XMP doc/templates"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -47,9 +45,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
 cd $PRGNAM-$VERSION || exit 1
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -64,8 +61,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-shared=yes \
   --enable-static=no \
+  --build=$ARCH-slackware-linux \
   || exit 1
 
 make || exit 1
@@ -82,9 +79,9 @@ make install DESTDIR=$PKG || exit 1
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README doc/ChangeLog doc/COPYING-XMPSDK doc/README-XMP doc/templates \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/exiv2/exiv2.info b/libraries/exiv2/exiv2.info
index 7dd6640e1e..275901f211 100644
--- a/libraries/exiv2/exiv2.info
+++ b/libraries/exiv2/exiv2.info
@@ -1,8 +1,8 @@
 PRGNAM="exiv2"
-VERSION="0.17.1"
+VERSION="0.18.1"
 HOMEPAGE="http://www.exiv2.org/"
-DOWNLOAD="http://www.exiv2.org/exiv2-0.17.1.tar.gz"
-MD5SUM="52a602f4f0d9e89b7084ac795b7547ac"
+DOWNLOAD="http://www.exiv2.org/exiv2-0.18.1.tar.gz"
+MD5SUM="744f06b3a2beeb2341f30b157cbd8e7e"
 MAINTAINER="Frank Caraballo"
 EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="dsomero"
diff --git a/libraries/exiv2/slack-desc b/libraries/exiv2/slack-desc
index f2a55eca5b..32e0c5c3ae 100644
--- a/libraries/exiv2/slack-desc
+++ b/libraries/exiv2/slack-desc
@@ -1,15 +1,15 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
 exiv2: Exiv2 (Exif and IPTC Metadata Library and Tools)
 exiv2:
-exiv2: Exiv2 is a C++ library and a command line utility to read
-exiv2: and write Exif and IPTC image metadata.
+exiv2: Exiv2 is a C++ library and a command line utility to read and write
+exiv2: Exif and IPTC image metadata.
 exiv2:
 exiv2: Homepage: http://www.exiv2.org/
 exiv2: