diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index d8d5e7f33a9..daf39ef7c72 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.5 2008/01/05 21:55:02 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2009/09/10 16:43:28 sthen Exp $
 
 HOMEPAGE=	http://www.exiv2.org/
 COMMENT=	manipulate image meta-data such as exif and ipct
 CATEGORIES=	graphics devel
 MASTER_SITES=	${HOMEPAGE}
-DISTNAME=	exiv2-0.15
+DISTNAME=	exiv2-0.18.2
 
-SHARED_LIBS +=	exiv2                2.0      # .0.0
-WANTLIB += 	c m stdc++ z
+SHARED_LIBS +=	exiv2                3.0      # .8.1
+WANTLIB += 	c m stdc++ z expat pthread
 
 USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes
@@ -16,8 +16,9 @@ CONFIGURE_STYLE=gnu
 MODULES=	devel/gettext
 
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} --enable-static
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -pthread"
 
-# GPL
+# GPLv2+
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_PACKAGE_CDROM=Yes
 PERMIT_DISTFILES_FTP=Yes
diff --git a/graphics/exiv2/distinfo b/graphics/exiv2/distinfo
index f55672c3acf..554bd37279e 100644
--- a/graphics/exiv2/distinfo
+++ b/graphics/exiv2/distinfo
@@ -1,5 +1,5 @@
-MD5 (exiv2-0.15.tar.gz) = uxjRnh1vslXa3aRWyt7ADg==
-RMD160 (exiv2-0.15.tar.gz) = uHm8voJVroOvfRz624SwHbxel/I=
-SHA1 (exiv2-0.15.tar.gz) = 21sNo5xdKnNs7PSAD4Njn4Qa9cw=
-SHA256 (exiv2-0.15.tar.gz) = ty2C6RFzCAY0cZk/ODLlgGTAWZ3sPfK/KnzlRFCYSj4=
-SIZE (exiv2-0.15.tar.gz) = 1133249
+MD5 (exiv2-0.18.2.tar.gz) = MAzFXgmNf/dWC0xpkigsUw==
+RMD160 (exiv2-0.18.2.tar.gz) = fvJiG0/XYEEVeyR60nRAWf+kAK8=
+SHA1 (exiv2-0.18.2.tar.gz) = RSyCSngIQ6Vo7u9o8weF7kFBsKg=
+SHA256 (exiv2-0.18.2.tar.gz) = pLjnIDeKve3AL45vlvQFLMTugiMXxiAKqJgz99RgaCo=
+SIZE (exiv2-0.18.2.tar.gz) = 2394263
diff --git a/graphics/exiv2/patches/patch-src_value_cpp b/graphics/exiv2/patches/patch-src_value_cpp
index 822d43cefbb..f4d0bcf51b3 100644
--- a/graphics/exiv2/patches/patch-src_value_cpp
+++ b/graphics/exiv2/patches/patch-src_value_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_value_cpp,v 1.2 2008/01/05 21:55:02 espie Exp $
---- src/value.cpp.orig	Tue Apr  3 04:09:41 2007
-+++ src/value.cpp	Sat Jan  5 12:17:08 2008
-@@ -442,7 +442,7 @@ namespace Exiv2 {
+$OpenBSD: patch-src_value_cpp,v 1.3 2009/09/10 16:43:28 sthen Exp $
+--- src/value.cpp.orig	Mon Feb 16 14:30:51 2009
++++ src/value.cpp	Sun Jun 28 14:43:11 2009
+@@ -827,7 +827,7 @@ namespace Exiv2 {
          // sprintf wants to add the null terminator, so use oversized buffer
          char temp[9];
  
@@ -9,8 +9,8 @@ $OpenBSD: patch-src_value_cpp,v 1.2 2008/01/05 21:55:02 espie Exp $
 +        int wrote = snprintf(temp, sizeof temp, "%04d%02d%02d",
                              date_.year, date_.month, date_.day);
          assert(wrote == 8);
-         memcpy(buf, temp, 8);
-@@ -591,7 +591,7 @@ namespace Exiv2 {
+         std::memcpy(buf, temp, 8);
+@@ -975,7 +975,7 @@ namespace Exiv2 {
          char plusMinus = '+';
          if (time_.tzHour < 0 || time_.tzMinute < 0) plusMinus = '-';
  
diff --git a/graphics/exiv2/pkg/PLIST b/graphics/exiv2/pkg/PLIST
index 73b74ffef27..a0a9eb1616d 100644
--- a/graphics/exiv2/pkg/PLIST
+++ b/graphics/exiv2/pkg/PLIST
@@ -1,46 +1,51 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/01/05 21:55:02 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/09/10 16:43:28 sthen Exp $
 %%SHARED%%
-bin/exiv2
+@bin bin/exiv2
 include/exiv2/
 include/exiv2/basicio.hpp
+include/exiv2/bmpimage.hpp
 include/exiv2/canonmn.hpp
+include/exiv2/convert.hpp
 include/exiv2/cr2image.hpp
 include/exiv2/crwimage.hpp
 include/exiv2/datasets.hpp
+include/exiv2/easyaccess.hpp
 include/exiv2/error.hpp
 include/exiv2/exif.hpp
 include/exiv2/exv_conf.h
-include/exiv2/exv_msvc.h
 include/exiv2/fujimn.hpp
 include/exiv2/futils.hpp
-include/exiv2/ifd.hpp
+include/exiv2/gifimage.hpp
 include/exiv2/image.hpp
 include/exiv2/iptc.hpp
+include/exiv2/jp2image.hpp
 include/exiv2/jpgimage.hpp
-include/exiv2/makernote.hpp
-include/exiv2/makernote2.hpp
 include/exiv2/metadatum.hpp
 include/exiv2/minoltamn.hpp
 include/exiv2/mn.hpp
 include/exiv2/mrwimage.hpp
 include/exiv2/nikonmn.hpp
 include/exiv2/olympusmn.hpp
+include/exiv2/orfimage.hpp
 include/exiv2/panasonicmn.hpp
-include/exiv2/pngchunk.hpp
+include/exiv2/pentaxmn.hpp
 include/exiv2/pngimage.hpp
+include/exiv2/preview.hpp
+include/exiv2/properties.hpp
+include/exiv2/psdimage.hpp
 include/exiv2/rafimage.hpp
 include/exiv2/rcsid.hpp
+include/exiv2/rw2image.hpp
 include/exiv2/sigmamn.hpp
 include/exiv2/sonymn.hpp
 include/exiv2/tags.hpp
-include/exiv2/tiffcomposite.hpp
-include/exiv2/tifffwd.hpp
+include/exiv2/tgaimage.hpp
 include/exiv2/tiffimage.hpp
-include/exiv2/tiffparser.hpp
-include/exiv2/tiffvisitor.hpp
 include/exiv2/types.hpp
 include/exiv2/value.hpp
 include/exiv2/version.hpp
+include/exiv2/xmp.hpp
+include/exiv2/xmpsidecar.hpp
 lib/libexiv2.a
 lib/libexiv2.la
 lib/pkgconfig/
@@ -52,3 +57,4 @@ share/locale/fi/LC_MESSAGES/exiv2.mo
 share/locale/fr/LC_MESSAGES/exiv2.mo
 share/locale/pl/LC_MESSAGES/exiv2.mo
 share/locale/ru/LC_MESSAGES/exiv2.mo
+share/locale/sk/LC_MESSAGES/exiv2.mo