diff --git a/x11-wm/compton/Makefile b/x11-wm/compton/Makefile
index 57932a4d320e..c36479c6b915 100644
--- a/x11-wm/compton/Makefile
+++ b/x11-wm/compton/Makefile
@@ -1,69 +1,67 @@
 PORTNAME=	compton
 PORTVERSION=	20160907
 PORTREVISION=	6
 CATEGORIES=	x11-wm
 
 MAINTAINER=	femc7488@gmail.com
 COMMENT=	Feature-rich compositing window manager for X11
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	xprop:x11/xprop \
 		xwininfo:x11/xwininfo
 
-CONFLICTS_INSTALL=	picom # bin/compton
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	chjj
 GH_TAGNAME=	b7f43ee
 
 USES=		gmake pkgconfig xorg
 USE_XORG=	x11 xcomposite xdamage xext xfixes xrandr xrender
 
 MAKE_ARGS=	COMPTON_VERSION=git-${PORTVERSION}-${GH_TAGNAME} \
 		XDGDIR=${LOCALBASE}/etc/xdg
 ALL_TARGET=	${PORTNAME}
 
 OPTIONS_DEFINE=	CONFIG PCRE DRM OPENGL DBUS XINERAMA DOCS
 OPTIONS_DEFAULT=	CONFIG PCRE DRM OPENGL DBUS XINERAMA
 
 CONFIG_DESC=	Configuration file parsing support
 PCRE_DESC=	Blacklist support (via libpcre)
 DRM_DESC=	DRM VSync method support
 OPENGL_DESC=	GLX backend, OpenGL VSync method, etc.
 DOCS_DESC=	Build manpages (requires AsciiDoc/DocBook)
 
 CONFIG_LIB_DEPENDS=	libconfig.so:devel/libconfig
 CONFIG_MAKE_ARGS_OFF=	NO_LIBCONFIG=yes
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_MAKE_ARGS_OFF=	NO_REGEX_PCRE=yes
 
 DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 DRM_MAKE_ARGS_OFF=	NO_VSYNC_DRM=yes
 
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl
 OPENGL_MAKE_ARGS_OFF=	NO_VSYNC_OPENGL=yes
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_MAKE_ARGS_OFF=	NO_DBUS=yes
 
 XINERAMA_USE=		XORG=xinerama
 XINERAMA_MAKE_ARGS_OFF=	NO_XINERAMA=yes
 
 DOCS_BUILD_DEPENDS=	a2x:textproc/asciidoc \
 			xsltproc:textproc/libxslt \
 			docbook-xml>0:textproc/docbook-xml \
 			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 DOCS_MAKE_ARGS=		DOCDIR=${DOCSDIR} MANDIR=${MANPREFIX}/man/man1
 DOCS_ALL_TARGET=	docs
 DOCS_PLIST_FILES=	man/man1/compton.1.gz man/man1/compton-trans.1.gz
 DOCS_PORTDOCS=		README.md cdbus-driver.sh
 
 post-patch:
 	@${REINPLACE_CMD} -e '/config_system_dir/s|/etc|${LOCALBASE}&|' \
 		${WRKSRC}/src/compton.c
 
 .include <bsd.port.mk>
diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile
index dbfcf3fe6264..d682e360abd9 100644
--- a/x11-wm/picom/Makefile
+++ b/x11-wm/picom/Makefile
@@ -1,72 +1,71 @@
 PORTNAME=	picom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	78223caea3f7.patch:-p1 # https://github.com/yshui/picom/pull/422
+PATCHFILES+=	b74f9d761664.patch:-p1 # https://github.com/yshui/picom/pull/424
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Lightweight X11 compositor
 
 LICENSE=	MIT MPL20
 LICENSE_COMB=	multi
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSES/MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash
 LIB_DEPENDS=	libev.so:devel/libev \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-render-util.so:x11/xcb-util-renderutil
 RUN_DEPENDS=	xprop:x11/xprop \
 		xwininfo:x11/xwininfo
 
-CONFLICTS_INSTALL=	compton # bin/compton
-
 USES=		compiler:c11 meson localbase pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	x11 xcb xext pixman
 GH_ACCOUNT=	yshui
-MESON_ARGS=	-Dunittest=true
+MESON_ARGS=	-Dcompton=false -Dunittest=true
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	CONFIG DBUS DOCS DRM OPENGL PCRE
 OPTIONS_DEFAULT=CONFIG DBUS OPENGL PCRE
 
 CONFIG_DESC=		Configuration file parsing support
 CONFIG_LIB_DEPENDS=	libconfig.so:devel/libconfig
 CONFIG_MESON_TRUE=	config_file
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_MESON_TRUE=	regex
 
 DRM_DESC=		DRM VSync fallback (deprecated)
 DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 DRM_MESON_TRUE=		vsync_drm
 
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl
 OPENGL_MESON_TRUE=	opengl
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_MESON_TRUE=	dbus
 
 DOCS_BUILD_DEPENDS=	a2x:textproc/asciidoc
 DOCS_MESON_TRUE=	with_docs
 DOCS_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz \
 			share/man/man1/${PORTNAME}-trans.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/src/config_libconfig.c
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e "/project_version/s/=.*/= '${DISTVERSIONFULL}'/" \
 		${WRKSRC}/meson.build
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.sample.conf \
 		${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>
diff --git a/x11-wm/picom/distinfo b/x11-wm/picom/distinfo
index 3cd80748d6da..0dfac8f21ca1 100644
--- a/x11-wm/picom/distinfo
+++ b/x11-wm/picom/distinfo
@@ -1,5 +1,7 @@
 TIMESTAMP = 1603529052
 SHA256 (yshui-picom-v8.2_GH0.tar.gz) = 9d0c2533985e9670ff175e717a42b5bf1a2a00ccde5cac1e1009f5d6ee7912ec
 SIZE (yshui-picom-v8.2_GH0.tar.gz) = 242653
 SHA256 (78223caea3f7.patch) = f9e32a1d348ea77343366e96111529f2cd2e78562aaf28252f9ea17c72afb7b1
 SIZE (78223caea3f7.patch) = 868
+SHA256 (b74f9d761664.patch) = 7938e13e812b3125677fce2be4d50aeb1988e2244211ec6c5ff9fc42b1c18073
+SIZE (b74f9d761664.patch) = 1978
diff --git a/x11-wm/picom/pkg-plist b/x11-wm/picom/pkg-plist
index 66edf3494d57..109a74ec14ca 100644
--- a/x11-wm/picom/pkg-plist
+++ b/x11-wm/picom/pkg-plist
@@ -1,9 +1,4 @@
-bin/compton
-bin/compton-trans
 bin/picom
 bin/picom-trans
 @sample etc/xdg/picom.conf.sample
-share/applications/compton.desktop
 share/applications/picom.desktop
-share/icons/hicolor/48x48/apps/compton.png
-share/icons/hicolor/scalable/apps/compton.svg