diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile
index a887c0052c48..9353471148c9 100644
--- a/graphics/webp/Makefile
+++ b/graphics/webp/Makefile
@@ -1,43 +1,46 @@
 # Created by: johans
 
 PORTNAME=	webp
 PORTVERSION=	1.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://downloads.webmproject.org/releases/webp/ \
 		https://storage.googleapis.com/downloads.webmproject.org/releases/webp/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Google WebP image format conversion tool
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgif.so:graphics/giflib \
-		libpng.so:graphics/png \
-		libtiff.so:graphics/tiff
-
 USES=		compiler:c11 jpeg libtool localbase
 
 CONFIGURE_ARGS=	--enable-libwebpdecoder \
 		--enable-libwebpdemux  \
 		--enable-libwebpmux \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
-OPTIONS_DEFINE=	X11
+OPTIONS_DEFINE=	IMGCONV X11
+OPTIONS_DEFAULT=IMGCONV
 OPTIONS_SUB=	yes
+IMGCONV_DESC=		Install converters to/from WebP
 
+IMGCONV_CONFIGURE_OFF=	build_cwebp=no build_dwebp=no build_gif2webp=no build_img2webp=no
+IMGCONV_CONFIGURE_ON=	build_cwebp=yes build_dwebp=yes build_gif2webp=yes build_img2webp=yes
+IMGCONV_LIB_DEPENDS=	libgif.so:graphics/giflib \
+			libpng.so:graphics/png \
+			libtiff.so:graphics/tiff
 X11_CONFIGURE_OFF=	build_vwebp=no
 X11_CONFIGURE_ON=	build_vwebp=yes
 X11_USE=		GL=glut
 X11_USES=		gl
 
 post-patch:
 	@${REINPLACE_CMD} '/build_vwebp=yes/d' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/webp/pkg-plist b/graphics/webp/pkg-plist
index 170c94eec91c..bec926770a21 100644
--- a/graphics/webp/pkg-plist
+++ b/graphics/webp/pkg-plist
@@ -1,40 +1,40 @@
-bin/cwebp
-bin/dwebp
-bin/gif2webp
-bin/img2webp
+%%IMGCONV%%bin/cwebp
+%%IMGCONV%%bin/dwebp
+%%IMGCONV%%bin/gif2webp
+%%IMGCONV%%bin/img2webp
 %%X11%%bin/vwebp
 bin/webpinfo
 bin/webpmux
 include/webp/decode.h
 include/webp/demux.h
 include/webp/encode.h
 include/webp/mux.h
 include/webp/mux_types.h
 include/webp/types.h
 lib/libwebp.a
 lib/libwebp.so
 lib/libwebp.so.7
 lib/libwebp.so.7.1.3
 lib/libwebpdecoder.a
 lib/libwebpdecoder.so
 lib/libwebpdecoder.so.3
 lib/libwebpdecoder.so.3.1.3
 lib/libwebpdemux.a
 lib/libwebpdemux.so
 lib/libwebpdemux.so.2
 lib/libwebpdemux.so.2.0.9
 lib/libwebpmux.a
 lib/libwebpmux.so
 lib/libwebpmux.so.3
 lib/libwebpmux.so.3.0.8
 libdata/pkgconfig/libwebp.pc
 libdata/pkgconfig/libwebpdecoder.pc
 libdata/pkgconfig/libwebpdemux.pc
 libdata/pkgconfig/libwebpmux.pc
-man/man1/cwebp.1.gz
-man/man1/dwebp.1.gz
-man/man1/gif2webp.1.gz
-man/man1/img2webp.1.gz
+%%IMGCONV%%man/man1/cwebp.1.gz
+%%IMGCONV%%man/man1/dwebp.1.gz
+%%IMGCONV%%man/man1/gif2webp.1.gz
+%%IMGCONV%%man/man1/img2webp.1.gz
 %%X11%%man/man1/vwebp.1.gz
 man/man1/webpinfo.1.gz
 man/man1/webpmux.1.gz