diff --git a/graphics/libwebp/Makefile b/graphics/libwebp/Makefile
index 29df548bfd7..9cf5cf02bf3 100755
--- a/graphics/libwebp/Makefile
+++ b/graphics/libwebp/Makefile
@@ -3,7 +3,7 @@ COMMENT=	Google WebP image format conversion tool
 GH_ACCOUNT=	webmproject
 GH_PROJECT=	libwebp
 GH_TAGNAME=	v1.6.0
-REVISION=	0
+REVISION=	1
 CATEGORIES=	graphics
 
 SHARED_LIBS +=  sharpyuv             0.1      # 0.0
@@ -17,31 +17,20 @@ HOMEPAGE=	https://developers.google.com/speed/webp/
 # BSD
 PERMIT_PACKAGE=	Yes
 
-WANTLIB=	${COMPILER_LIBCXX} Lerc c gif jpeg lzma m png pthread \
-		tiff z zstd
+WANTLIB=	c gif jpeg m png pthread tiff z
 
-COMPILER=	base-clang ports-gcc base-gcc
+MODULES=	devel/cmake
+
+COMPILER=	base-clang ports-gcc
+COMPILER_LANGS=	c
 
 LIB_DEPENDS=	graphics/giflib \
 		graphics/jpeg \
 		graphics/png \
 		graphics/tiff
 
-AUTOCONF_VERSION=	2.72
-AUTOMAKE_VERSION=	1.17
-
-CONFIGURE_STYLE=	autoreconf
-
-CONFIGURE_ARGS= --enable-everything
-
-# this will use libSDL to build stuff under extras otherwise
-# (a static webp viewer which is more or less useless, and not
-# even installed by default)
-CONFIGURE_ARGS +=--disable-gl \
-		--disable-sdl
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	-DBUILD_SHARED_LIBS=ON \
+		-DWEBP_BUILD_VWEBP=OFF
 
 DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
diff --git a/graphics/libwebp/pkg/PLIST b/graphics/libwebp/pkg/PLIST
index 56539d77e54..27cabb9395f 100644
--- a/graphics/libwebp/pkg/PLIST
+++ b/graphics/libwebp/pkg/PLIST
@@ -14,20 +14,10 @@ include/webp/sharpyuv/
 include/webp/sharpyuv/sharpyuv.h
 include/webp/sharpyuv/sharpyuv_csp.h
 include/webp/types.h
-@static-lib lib/libsharpyuv.a
-lib/libsharpyuv.la
 @lib lib/libsharpyuv.so.${LIBsharpyuv_VERSION}
-@static-lib lib/libwebp.a
-lib/libwebp.la
 @lib lib/libwebp.so.${LIBwebp_VERSION}
-@static-lib lib/libwebpdecoder.a
-lib/libwebpdecoder.la
 @lib lib/libwebpdecoder.so.${LIBwebpdecoder_VERSION}
-@static-lib lib/libwebpdemux.a
-lib/libwebpdemux.la
 @lib lib/libwebpdemux.so.${LIBwebpdemux_VERSION}
-@static-lib lib/libwebpmux.a
-lib/libwebpmux.la
 @lib lib/libwebpmux.so.${LIBwebpmux_VERSION}
 lib/pkgconfig/libsharpyuv.pc
 lib/pkgconfig/libwebp.pc
@@ -40,3 +30,9 @@ lib/pkgconfig/libwebpmux.pc
 @man man/man1/img2webp.1
 @man man/man1/webpinfo.1
 @man man/man1/webpmux.1
+share/WebP/
+share/WebP/cmake/
+share/WebP/cmake/WebPConfig.cmake
+share/WebP/cmake/WebPConfigVersion.cmake
+share/WebP/cmake/WebPTargets${MODCMAKE_BUILD_SUFFIX}
+share/WebP/cmake/WebPTargets.cmake