diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 0782252eb66b..6fa6eb01f7d5 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	exiv2
-PORTVERSION=	0.21
-PORTEPOCH=	1
+PORTVERSION=	0.21.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.exiv2.org/
 
@@ -22,8 +21,8 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 MAN1=		exiv2.1
 ALLTARGET=	all
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
diff --git a/graphics/exiv2/distinfo b/graphics/exiv2/distinfo
index f7faac0b0564..6e08c344e2d4 100644
--- a/graphics/exiv2/distinfo
+++ b/graphics/exiv2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (exiv2-0.21.tar.gz) = d827d7a4e617b042203ebd04b5bc259690ec699aa2c71b78d5682718d68737e5
-SIZE (exiv2-0.21.tar.gz) = 3002066
+SHA256 (exiv2-0.21.1.tar.gz) = 2edae035760f84afdfebdf3123a166e6bbf77870697afe54dea92a783f041817
+SIZE (exiv2-0.21.1.tar.gz) = 3004521