diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile
index 11803809255c..4ec7d5d8b692 100644
--- a/x11-wm/picom/Makefile
+++ b/x11-wm/picom/Makefile
@@ -1,75 +1,70 @@
 PORTNAME=	picom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.2
-PORTREVISION=	3
+DISTVERSION=	9-rc1
 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
 
 USES=		compiler:c11 meson localbase pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	x11 xcb xext pixman
 GH_ACCOUNT=	yshui
 MESON_ARGS=	-Dcompton=false -Dunittest=true
 TEST_TARGET=	test
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/${PORTNAME}-trans \
 		"@sample etc/xdg/${PORTNAME}.conf.sample" \
 		share/applications/${PORTNAME}.desktop
 
 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
+DOCS_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
+			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 0dfac8f21ca1..970ee65adf92 100644
--- a/x11-wm/picom/distinfo
+++ b/x11-wm/picom/distinfo
@@ -1,7 +1,3 @@
-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
+TIMESTAMP = 1643282490
+SHA256 (yshui-picom-v9-rc1_GH0.tar.gz) = 4301c9d64247bc7ac1f446dabfff473408f8d2d5562e29e099ea94f452db1bc8
+SIZE (yshui-picom-v9-rc1_GH0.tar.gz) = 263793