diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index 8fd5595d603a..42aa32cb045c 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -1,82 +1,76 @@
 # Created by: Jason Helfman <jgh@FreeBSD.org>
 
 PORTNAME=	xpad
-PORTVERSION=	5.4.0
-PORTREVISION=	2
+PORTVERSION=	5.7.0
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Virtual note-pad system for your X11 desktop
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme
+LIB_DEPENDS+=	libharfbuzz.so:print/harfbuzz
 
 USES=		autoreconf compiler:c++11-lang gmake pkgconfig tar:bzip2 gnome xorg
 
 OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_SUB=	yes
 
 CONFLICTS_INSTALL=	xpad3
 USE_XORG=	x11 sm ice
-USE_GNOME=	gtk30 intltool gtksourceview3 cairo
+USE_GNOME=	gtk30 gtksourceview4 cairo gdkpixbuf2
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 PORTDOCS=	*
 PLIST_FILES=	\
 bin/xpad \
 man/man1/xpad.1.gz \
 share/applications/xpad.desktop \
 share/icons/hicolor/scalable/apps/xpad.svg \
 share/metainfo/xpad.appdata.xml \
 ${DATADIR}/help/xpad-user-help.txt
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_PLIST_FILES=	\
 share/locale/af/LC_MESSAGES/xpad.mo \
 share/locale/bg/LC_MESSAGES/xpad.mo \
 share/locale/cs/LC_MESSAGES/xpad.mo \
 share/locale/da/LC_MESSAGES/xpad.mo \
 share/locale/de/LC_MESSAGES/xpad.mo \
 share/locale/en_GB/LC_MESSAGES/xpad.mo \
 share/locale/es/LC_MESSAGES/xpad.mo \
 share/locale/et/LC_MESSAGES/xpad.mo \
 share/locale/fi/LC_MESSAGES/xpad.mo \
 share/locale/fr/LC_MESSAGES/xpad.mo \
 share/locale/ga/LC_MESSAGES/xpad.mo \
 share/locale/hr/LC_MESSAGES/xpad.mo \
 share/locale/hu/LC_MESSAGES/xpad.mo \
 share/locale/it/LC_MESSAGES/xpad.mo \
 share/locale/ja/LC_MESSAGES/xpad.mo \
 share/locale/ko/LC_MESSAGES/xpad.mo \
 share/locale/lv/LC_MESSAGES/xpad.mo \
 share/locale/nl/LC_MESSAGES/xpad.mo \
 share/locale/pt/LC_MESSAGES/xpad.mo \
 share/locale/ro/LC_MESSAGES/xpad.mo \
 share/locale/ru/LC_MESSAGES/xpad.mo \
 share/locale/rw/LC_MESSAGES/xpad.mo \
 share/locale/sv/LC_MESSAGES/xpad.mo \
 share/locale/th/LC_MESSAGES/xpad.mo \
 share/locale/tr/LC_MESSAGES/xpad.mo \
 share/locale/vi/LC_MESSAGES/xpad.mo \
 share/locale/zh_CN/LC_MESSAGES/xpad.mo \
 share/locale/zh_TW/LC_MESSAGES/xpad.mo
 
 .include <bsd.port.options.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|glib/glist.h|glib.h|g' \
-		${WRKSRC}/src/xpad-undo.c
-	@${REINPLACE_CMD} -e 's|/etc/xdg/autostart|${LOCALBASE}/etc/xdg/autostart|g' \
-		${WRKSRC}/Makefile.am
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO THANKS
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/deskutils/xpad/distinfo b/deskutils/xpad/distinfo
index 99d91ae2bec3..a45762dd89b1 100644
--- a/deskutils/xpad/distinfo
+++ b/deskutils/xpad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565721806
-SHA256 (xpad-5.4.0.tar.bz2) = a395cb282a2cfb0d56f1e911afb7e38ad74f6d738082a7c6c181b3052ca7f5e2
-SIZE (xpad-5.4.0.tar.bz2) = 163394
+TIMESTAMP = 1652600372
+SHA256 (xpad-5.7.0.tar.bz2) = ead80a5e8b52e854d730e0c075df5a190be311522a441e87f1d2ec57fdd0856b
+SIZE (xpad-5.7.0.tar.bz2) = 162675
diff --git a/deskutils/xpad/pkg-descr b/deskutils/xpad/pkg-descr
index e53f99d7be90..fcf2798e95ac 100644
--- a/deskutils/xpad/pkg-descr
+++ b/deskutils/xpad/pkg-descr
@@ -1,17 +1,17 @@
 xpad is a sticky note application written using GTK+ 3.0 that strives to be
 simple, fault-tolerant, and customizable. xpad consists of independent pad
 windows; each is basically a text box in which notes can be written. Despite
 being called xpad, all that is needed to run or compile it is the GTK+ 3.0
 libraries. Here is a list of major features in the current xpad current
 release:
 
   * GTK+ 3.0 powered text view.
   * Fault tolerant. All information is kept on the hard drive, not memory.
   * xpad is very customizable. The color scheme (text, background, and window
     borders) and the font can be changed.
   * A customizable toolbar puts the most frequently used commands at your
     fingertips.
   * Support for the X session management protocol.
   * Support for the www.freedesktop.org system tray proposal.
 
-WWW: https://launchpad.net/xpad
+WWW: https://launchpad.net/xpad/trunk