diff --git a/x11/xnotify/Makefile b/x11/xnotify/Makefile
index 319fa790f79b..fb45ef3e2d8c 100644
--- a/x11/xnotify/Makefile
+++ b/x11/xnotify/Makefile
@@ -1,37 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2023/01/29 21:18:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2023/09/10 11:37:28 vins Exp $
 
-DISTNAME=	xnotify-0.8.1
-PKGREVISION=	1
+DISTNAME=	xnotify-0.9.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=phillbush/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	vins@NetBSD.org
 HOMEPAGE=	https://github.com/phillbush/xnotify
 COMMENT=	Read notifications from stdin and display them on the screen
 LICENSE=	mit
 
-SUBST_CLASSES+=		configmk
-SUBST_STAGE.configmk=	pre-configure
-SUBST_MESSAGE.configmk=	Adjusting config.mk
-SUBST_FILES.configmk=	config.mk
-SUBST_SED.configmk+=	-e 's,/usr/local,${PREFIX},g'
-SUBST_SED.configmk+=	-e 's,share/man,${PKGMANDIR},g'
-SUBST_SED.configmk+=	-e 's,/usr/X11R6,${X11BASE},'
-SUBST_SED.configmk+=	-e 's,^CFLAGS *= ,CFLAGS += ,'
-SUBST_SED.configmk+=	-e 's,^LDFLAGS *= ,LDFLAGS += ,'
-SUBST_SED.configmk+=	-e 's/-I$${FREETYPEINC}/$${FREETYPEINC}/'
-SUBST_SED.configmk+=	-e 's,^FREETYPEINC *=.*,FREETYPEINC != freetype-config --cflags,'
-SUBST_SED.configmk+=	-e 's/cc/${CC:Q}/'
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
 CFLAGS.SunOS+=		-D_XOPEN_SOURCE=500
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xnotify ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xnotify.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/xnotify/distinfo b/x11/xnotify/distinfo
index 2a1ffea481a4..a972feda8b31 100644
--- a/x11/xnotify/distinfo
+++ b/x11/xnotify/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:34:54 nia Exp $
+$NetBSD: distinfo,v 1.6 2023/09/10 11:37:28 vins Exp $
 
-BLAKE2s (xnotify-0.8.1.tar.gz) = cf8674d741b1c163ec915967d45530a7d8dbd51405e0cd8e84e4b8ddf7487c0f
-SHA512 (xnotify-0.8.1.tar.gz) = 74fbd81e674313d688e4e288bb4e7a0bf095caed6db467e0b5cf0b3ea96fd1edc4336bad1c83bd80fa6c550385eb95ffd6011f2151649472d02d17f27ff60147
-Size (xnotify-0.8.1.tar.gz) = 15189 bytes
+BLAKE2s (xnotify-0.9.3.tar.gz) = db49a68d8798c7071ef6f30e8fb217083d75a4e972769b865007fe8f30790971
+SHA512 (xnotify-0.9.3.tar.gz) = 0d441d2ded313c1072ec614457769c33c1ea7f90906ea519242b2e9cddf2c23b465291782d82c4f2b4b602e443e0f0db097cd34043c675e79d3a7bd8575c66e5
+Size (xnotify-0.9.3.tar.gz) = 16864 bytes
+SHA1 (patch-Makefile) = bff8413741a2855fa0e40ca4a9aaca0303ed751e
diff --git a/x11/xnotify/patches/patch-Makefile b/x11/xnotify/patches/patch-Makefile
new file mode 100644
index 000000000000..ebd627ad5980
--- /dev/null
+++ b/x11/xnotify/patches/patch-Makefile
@@ -0,0 +1,47 @@
+$NetBSD: patch-Makefile,v 1.1 2023/09/10 11:37:29 vins Exp $
+
+Portability fixes for pkgsrc.
+
+--- Makefile.orig	2023-01-13 20:28:28.000000000 +0000
++++ Makefile
+@@ -2,15 +2,16 @@ PROG = xnotify
+ OBJS = ${PROG:=.o}
+ SRCS = ${OBJS:.o=.c}
+ 
+-PREFIX ?= /usr/local
+-MANPREFIX ?= ${PREFIX}/share/man
++PREFIX ?= ${PREFIX} 
++MANPREFIX ?= ${PREFIX}/${PKGMANDIR}
+ LOCALINC ?= /usr/local/include
+ LOCALLIB ?= /usr/local/lib
+ X11INC ?= /usr/X11R6/include
+ X11LIB ?= /usr/X11R6/lib
+ 
+-INCS = -I${LOCALINC} -I${X11INC} -I/usr/include/freetype2 -I${X11INC}/freetype2
+-LIBS = -L${LOCALLIB} -L${X11LIB} -lfontconfig -lXft -lX11 -lXinerama -lImlib2
++# Do not override defaults. 
++#INCS = -I${LOCALINC} -I${X11INC} -I/usr/include/freetype2 -I${X11INC}/freetype2
++LIBS = -lfreetype -lfontconfig -lXft -lX11 -lXinerama -lImlib2
+ 
+ all: ${PROG}
+ 
+@@ -29,13 +30,13 @@ clean:
+ 	rm -f ${OBJS} ${PROG} ${PROG:=.core} tags
+ 
+ install: all
+-	mkdir -p ${DESTDIR}${PREFIX}/bin
+-	install -m 755 ${PROG} ${DESTDIR}${PREFIX}/bin/${PROG}
+-	mkdir -p ${DESTDIR}${MANPREFIX}/man1
+-	install -m 644 ${PROG:=.1} ${DESTDIR}${MANPREFIX}/man1/${PROG:=.1}
++	${BSD_INSTALL_PROGRAM_DIR} -p ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} ${PROG} ${DESTDIR}${PREFIX}/bin/${PROG}
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
++	${BSD_INSTALL_MAN} ${PROG:=.1} ${DESTDIR}${MANPREFIX}/man1/${PROG:=.1}
+ 
+ uninstall:
+-	rm ${DESTDIR}${PREFIX}/bin/${PROG}
+-	rm ${DESTDIR}${MANPREFIX}/man1/${PROG:=.1}
++	${RM} ${DESTDIR}${PREFIX}/bin/${PROG}
++	${RM} ${DESTDIR}${MANPREFIX}/man1/${PROG:=.1}
+ 
+ .PHONY: all tags clean install uninstall