diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 349b704907b7..e991646e9e4b 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,166 +1,171 @@
 PORTNAME=	conky
-PORTVERSION=	1.20.2
+PORTVERSION=	1.21.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	fernape@FreeBSD.org
 COMMENT?=	Advanced, highly configurable system monitor for X11
 WWW=		https://github.com/brndnmtthws/conky
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	gperf:devel/gperf \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USES=		cmake compiler:c++11-lib cpe gettext-runtime iconv \
 		localbase:ldflags lua:53 pkgconfig tar:bzip2
 USE_GITHUB=	yes
 GH_ACCOUNT=	brndnmtthws
 
 CMAKE_ARGS=	-DAPP_SED=${LOCALBASE}/bin/gsed \
 		-DBUILD_AUDACIOUS:BOOL=false \
 		-DBUILD_HDDTEMP:BOOL=false \
 		-DBUILD_IBM:BOOL=false \
 		-DBUILD_IOSTATS:BOOL=false \
 		-DBUILD_PORT_MONITORS:BOOL=false
 CONFLICTS?=	conky-awesome
 
 SLAVEDIRS=	sysutils/conky-awesome
-PLIST_FILES=	bin/conky
+PLIST_FILES=	bin/conky \
+		lib/libVc.a
 PORTDOCS=	config_settings.yaml lua.yaml variables.yaml
 PORTEXAMPLES=	conky.conf conky_no_x11.conf convert.lua
 
 OPTIONS_DEFINE=	APCUPSD CURL DOCS EXAMPLES IPV6 MANPAGES METAR MOC MPD NCURSES \
 		RSS WAYLAND X11 XOAP
 
 OPTIONS_DEFAULT?=	ARGB DOUBLE_BUFFER LUA_CAIRO MANPAGES MOUSE_EVENTS \
 			WAYLAND X11 XFT
 OPTIONS_GROUP?=		X11
 OPTIONS_GROUP_X11=	ARGB DOUBLE_BUFFER IMLIB2 LUA_CAIRO LUA_IMLIB2 LUA_RSVG \
 			MOUSE_EVENTS XFT XINERAMA
 
 APCUPSD_DESC=		Monitor APCUPSD
 ARGB_DESC=		Use an ARGB visual to draw on X11
 DOUBLE_BUFFER_DESC=	X11 double buffering
 LUA_CAIRO_DESC=		Lua-Cairo binding
 LUA_IMLIB2_DESC=	Lua-Imlib2 binding
 LUA_RSVG_DESC=		Lua-rsvg binding
 METAR_DESC=		Display METAR weather reports
 MOC_DESC=		Control MOC (Music On Console)
 MOUSE_EVENTS_DESC=	Support generating mouse events
 MPD_DESC=		Control MPD (Music Player Daemon)
 NCURSES_DESC=		Use ncurses to draw on terminals
 RSS_DESC=		Display RSS feeds
 XOAP_DESC=		Display XOAP weather reports
 
 APCUPSD_CMAKE_BOOL=	BUILD_APCUPSD
 
 ARGB_IMPLIES=		X11
 ARGB_CMAKE_BOOL=	BUILD_ARGB
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	BUILD_CURL
 
 DOUBLE_BUFFER_IMPLIES=		X11
 DOUBLE_BUFFER_CMAKE_BOOL=	BUILD_XDBE
 
 IMLIB2_IMPLIES=		X11
 IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_USE=		XORG=ice,sm
 IMLIB2_CMAKE_BOOL=	BUILD_IMLIB2
 
 IPV6_CMAKE_BOOL=	BUILD_IPV6
 
 LUA_CAIRO_IMPLIES=	X11
 LUA_CAIRO_USES=		gnome
 LUA_CAIRO_USE=		GNOME=cairo
 LUA_CAIRO_CMAKE_BOOL=	BUILD_LUA_CAIRO
 LUA_CAIRO_PLIST_FILES=	lib/conky/libcairo.so \
 			lib/conky/libcairo_xlib.so
 
 LUA_IMLIB2_IMPLIES=	IMLIB2 X11
 LUA_IMLIB2_CMAKE_BOOL=	BUILD_LUA_IMLIB2
 LUA_IMLIB2_PLIST_FILES=	lib/conky/libimlib2.so
 
 LUA_RSVG_IMPLIES=	X11
 LUA_RSVG_USES=		gnome
 LUA_RSVG_USE=		GNOME=librsvg2
 LUA_RSVG_CMAKE_BOOL=	BUILD_LUA_RSVG
 LUA_RSVG_PLIST_FILES=	lib/conky/librsvg.so
 
 MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 			pandoc:textproc/hs-pandoc
 MANPAGES_USES=		python:build
 MANPAGES_CMAKE_BOOL=	BUILD_DOCS
 MANPAGES_PLIST_FILES=	share/man/man1/conky.1.gz
 
 METAR_IMPLIES=		CURL
 METAR_CMAKE_BOOL=	BUILD_WEATHER_METAR
 
 MOC_CMAKE_BOOL=	BUILD_MOC
 
 MOUSE_EVENTS_IMPLIES=		X11
 MOUSE_EVENTS_CMAKE_BOOL=	BUILD_MOUSE_EVENTS
 
 MPD_CMAKE_BOOL=	BUILD_MPD
 
 NCURSES_USES=		ncurses:port
 NCURSES_CMAKE_BOOL=	BUILD_NCURSES
 
 RSS_IMPLIES=	CURL
 RSS_USES=	gnome
 RSS_USE=	GNOME=libxml2
 RSS_CMAKE_BOOL=	BUILD_RSS
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.13:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libwayland-client.so:graphics/wayland
 WAYLAND_USES=		gnome
 WAYLAND_USE=		GNOME=cairo,pango
 WAYLAND_CMAKE_BOOL=	BUILD_WAYLAND
 WAYLAND_LDFLAGS=	-Wl,--as-needed # pangoft2 deps: glib20, freetype2, harfbuzz
 
 X11_USES=	xorg
 X11_USE=	XORG=x11,xdamage,xext,xfixes,xi
 X11_CMAKE_BOOL=	BUILD_X11 OWN_WINDOW
 
 XFT_IMPLIES=	X11
 XFT_USE=	XORG=xft
 XFT_CMAKE_BOOL=	BUILD_XFT
 
 XINERAMA_IMPLIES=	X11
 XINERAMA_USE=		XORG=xinerama
 XINERAMA_CMAKE_BOOL=	BUILD_XINERAMA
 
 XOAP_IMPLIES=		CURL METAR
 XOAP_USES=		gnome
 XOAP_USE=		GNOME=libxml2
 XOAP_CMAKE_BOOL=	BUILD_WEATHER_XOAP
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLUA_CAIRO} && ${PORT_OPTIONS:MLUA_IMLIB2}
 PLIST_FILES+=	lib/conky/libcairo_imlib2_helper.so
 .endif
 
 # disable apm on non-x86 archs
 .if ${ARCH} != amd64 && ${ARCH} != i386
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_CMakeLists.txt
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \
 		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
+post-install:
+	${RM} -rf ${STAGEDIR}${PREFIX}/include
+	${RM} -rf ${STAGEDIR}${PREFIX}/lib/cmake
+
 .include <bsd.port.mk>
diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
index fd80db491a5a..28921e65f13d 100644
--- a/sysutils/conky/distinfo
+++ b/sysutils/conky/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714027251
-SHA256 (brndnmtthws-conky-v1.20.2_GH0.tar.gz) = 16f2e17d35252c1c3b97363016ede5cd68be719c32a51961420fcd46859bf503
-SIZE (brndnmtthws-conky-v1.20.2_GH0.tar.gz) = 1837320
+TIMESTAMP = 1715452113
+SHA256 (brndnmtthws-conky-v1.21.0_GH0.tar.gz) = fff08ee35c15caf85ca62119c2694b9392f770eb4a8f1b5e07738d96edd0e5ac
+SIZE (brndnmtthws-conky-v1.21.0_GH0.tar.gz) = 2146867
diff --git a/sysutils/conky/files/patch-src_display-x11.cc b/sysutils/conky/files/patch-src_display-x11.cc
deleted file mode 100644
index e98b4f3e347a..000000000000
--- a/sysutils/conky/files/patch-src_display-x11.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/display-x11.cc.orig	2024-04-24 13:56:28 UTC
-+++ src/display-x11.cc
-@@ -683,7 +683,9 @@ bool handle_event<x_event_handler::BORDER_CROSSING>(
-     conky::display_output_x11 *surface, Display *display, XEvent &ev,
-     bool *consumed, void **cookie) {
-   if (ev.type != EnterNotify && ev.type != LeaveNotify) return false;
-+#ifdef BUILD_XINPUT
-   if (window.xi_opcode != 0) return true;  // handled by mouse_input already
-+#endif
- 
-   bool not_over_conky = ev.xcrossing.x_root <= window.x ||
-                         ev.xcrossing.y_root <= window.y ||
-@@ -692,11 +694,13 @@ bool handle_event<x_event_handler::BORDER_CROSSING>(
- 
-   if ((not_over_conky && ev.xcrossing.type == LeaveNotify) ||
-       (!not_over_conky && ev.xcrossing.type == EnterNotify)) {
-+#ifdef BUILD_MOUSE_EVENTS
-     llua_mouse_hook(mouse_crossing_event(
-         ev.xcrossing.type == EnterNotify ? mouse_event_t::AREA_ENTER
-                                          : mouse_event_t::AREA_LEAVE,
-         ev.xcrossing.x, ev.xcrossing.y, ev.xcrossing.x_root,
-         ev.xcrossing.y_root));
-+#endif
-   }
-   return true;
- }
diff --git a/sysutils/conky/files/patch-src_llua.h b/sysutils/conky/files/patch-src_llua.h
new file mode 100644
index 000000000000..f5486ed1186f
--- /dev/null
+++ b/sysutils/conky/files/patch-src_llua.h
@@ -0,0 +1,10 @@
+--- src/llua.h.orig	2024-05-07 20:02:47 UTC
++++ src/llua.h
+@@ -31,6 +31,7 @@ extern "C" {
+ }
+ 
+ #include <config.h>
++#include "geometry.h"
+ 
+ #ifdef BUILD_MOUSE_EVENTS
+ #include "mouse-events.h"
diff --git a/sysutils/conky/files/patch-src_x11-settings.cc b/sysutils/conky/files/patch-src_x11-settings.cc
new file mode 100644
index 000000000000..d5602d3839a7
--- /dev/null
+++ b/sysutils/conky/files/patch-src_x11-settings.cc
@@ -0,0 +1,11 @@
+--- src/x11-settings.cc.orig	2024-05-07 20:02:47 UTC
++++ src/x11-settings.cc
+@@ -77,7 +77,7 @@ bool use_xpmdb_setting::set_up(lua::state &l) {
+   if (!out_to_x.get(l)) return false;
+ 
+   window.back_buffer =
+-      XCreatePixmap(display, window.window, window.width + 1, window.height + 1,
++      XCreatePixmap(display, window.window, window.geometry.get_width() + 1, window.geometry.get_height() + 1,
+                     DefaultDepth(display, screen));
+   if (window.back_buffer != None) {
+     window.drawable = window.back_buffer;
diff --git a/sysutils/conky/files/patch-src_x11.cc b/sysutils/conky/files/patch-src_x11.cc
new file mode 100644
index 000000000000..b341e374a623
--- /dev/null
+++ b/sysutils/conky/files/patch-src_x11.cc
@@ -0,0 +1,16 @@
+--- src/x11.cc.orig	2024-05-14 16:06:21 UTC
++++ src/x11.cc
+@@ -1215,10 +1215,10 @@ void xpmdb_swap_buffers(void) {
+ void xpmdb_swap_buffers(void) {
+   if (use_xpmdb.get(*state)) {
+     XCopyArea(display, window.back_buffer, window.window, window.gc, 0, 0,
+-              window.width, window.height, 0, 0);
++              window.geometry.get_width(), window.geometry.get_height(), 0, 0);
+     XSetForeground(display, window.gc, 0);
+-    XFillRectangle(display, window.drawable, window.gc, 0, 0, window.width,
+-                   window.height);
++    XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.get_width(),
++                   window.geometry.get_height());
+     XFlush(display);
+   }
+ }