diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index acb729eb4d5d..e8627718866d 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -1,35 +1,35 @@
 #
 # !!!NOTE!!! Update of x11-toolkits/gtk30 (specially >= 3.20.x) must be
 # accompanied by PORTREVISION bumps of this port.
 # Support of GTK+ is checked at compile time and themes directories too.
 
 PORTNAME=	xfce4-notifyd
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.4
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Visually-appealing notification daemon for Xfce
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
 		libnotify.so:devel/libnotify
 
 USES=		compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
 		tar:bzip2 xfce xorg
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool
 USE_XFCE=	libutil panel
 USE_XORG=	ice sm x11
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/deskutils/xfce4-notifyd/distinfo b/deskutils/xfce4-notifyd/distinfo
index ac993254c555..a00e9876a9cf 100644
--- a/deskutils/xfce4-notifyd/distinfo
+++ b/deskutils/xfce4-notifyd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644698923
-SHA256 (xfce4/xfce4-notifyd-0.6.3.tar.bz2) = 56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f
-SIZE (xfce4/xfce4-notifyd-0.6.3.tar.bz2) = 547511
+TIMESTAMP = 1662106707
+SHA256 (xfce4/xfce4-notifyd-0.6.4.tar.bz2) = 0ece78f091f895374aad81a3bdc00701080b4ed07f7322fb680c4234319120f6
+SIZE (xfce4/xfce4-notifyd-0.6.4.tar.bz2) = 554776
diff --git a/deskutils/xfce4-notifyd/files/patch-common_xfce-notify-log.c b/deskutils/xfce4-notifyd/files/patch-common_xfce-notify-log.c
new file mode 100644
index 000000000000..0c83141e9543
--- /dev/null
+++ b/deskutils/xfce4-notifyd/files/patch-common_xfce-notify-log.c
@@ -0,0 +1,13 @@
+--- common/xfce-notify-log.c.orig	2022-09-02 07:22:08 UTC
++++ common/xfce-notify-log.c
+@@ -149,7 +149,9 @@ notify_get_from_desktop_file (const gchar *desktop_fil
+ 
+             match = matches[0];
+             appinfo = g_desktop_app_info_new (match[0]);
+-            value = notify_read_from_desktop_file (g_desktop_app_info_get_filename (appinfo), key);
++            if (appinfo != NULL) {
++                value = notify_read_from_desktop_file (g_desktop_app_info_get_filename (appinfo), key);
++            }
+ 
+             for (gchar ***p = matches; *p != NULL; p++)
+                 g_strfreev (*p);