diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index 7f3fcdeea381..c6903e8b16f0 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -9,27 +9,20 @@ MASTER_SITES=	SF/lib${PORTNAME}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Command line utility to read and manipulate EXIF data
 
+LICENSE=	LGPL21
+
 LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 		libpopt.so:${PORTSDIR}/devel/popt
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
 CONFIGURE_ENV=	POPT_CFLAGS=-I${LOCALBASE}/include POPT_LIBS="-L${LOCALBASE}/lib -lpopt"
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=--enable-nls ${ICONV_CONFIGURE_ARG}
-USES+=		gettext iconv
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls --without-libiconv-prefix
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-MAN1=		exif.1
+NLS_CONFIGURE_ON=	--enable-nls ${ICONV_CONFIGURE_ARG}
+NLS_CONFIGURE_OFF=	--disable-nls --without-libiconv-prefix
+NLS_USES=		gettext iconv
 
 .include <bsd.port.mk>
diff --git a/graphics/exif/pkg-plist b/graphics/exif/pkg-plist
index 34c2c65aa36b..2ccdacfab6ec 100644
--- a/graphics/exif/pkg-plist
+++ b/graphics/exif/pkg-plist
@@ -1,4 +1,5 @@
 bin/exif
+man/man1/exif.1.gz
 %%NLS%%share/locale/cs/LC_MESSAGES/exif.mo
 %%NLS%%share/locale/da/LC_MESSAGES/exif.mo
 %%NLS%%share/locale/de/LC_MESSAGES/exif.mo