diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 59e08b25c9ef..524fb782080d 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -35,11 +35,17 @@ PORTSCOUT=	limitw:1,even
 _LIBVERSION=	0.6600.7
 PLIST_SUB=	LIBVERSION=${_LIBVERSION}
 
-OPTIONS_DEFINE=	DEBUG FAM_ALTBACKEND MANPAGES NLS
-OPTIONS_DEFAULT=	MANPAGES
+OPTIONS_DEFINE=	DEBUG MANPAGES NLS
+OPTIONS_DEFAULT=	LIBINOTIFY MANPAGES
+OPTIONS_RADIO=		FAM
+OPTIONS_RADIO_FAM=	BUILTIN FAM_ALTBACKEND LIBINOTIFY
 OPTIONS_SUB=		yes
 
+BUILTIN_DESC=		Built-in GIO file monitor backend
 FAM_ALTBACKEND_DESC=	Alternate file monitor backend
+LIBINOTIFY_DESC=	Libinotify file monitor backend
+LIBINOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
+LIBINOTIFY_LDFLAGS=	-linotify
 
 MANPAGES_BUILD_DEPENDS=	docbook-xml>4.1.2:textproc/docbook-xml \
 			docbook-xsl>0:textproc/docbook-xsl
@@ -80,9 +86,6 @@ post-patch:
 		${WRKSRC}/glib/gtester-report.in \
 		${WRKSRC}/gobject/glib-genmarshal.in \
 		${WRKSRC}/gobject/glib-mkenums.in
-	${REINPLACE_CMD} -e '/inotify_init1/d' \
-		-e '/inotify.h/d' \
-		${WRKSRC}/meson.build
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/gio/xdgmime/xdgmime.c \
 		${WRKSRC}/glib/gutils.c \
@@ -90,6 +93,17 @@ post-patch:
 
 CODEGENDIR=	${PREFIX}/share/glib-2.0/codegen
 
+post-patch-LIBINOTIFY-on:
+	${REINPLACE_CMD} -e '/kqueue/d ; /kevent/d ; /event.h/d' \
+		${WRKSRC}/meson.build
+	${REINPLACE_CMD} -e 's/have_func_kqueue/false/' \
+		-e 's/have_func_kevent/false/' \
+		${WRKSRC}/gio/meson.build
+
+post-patch-LIBINOTIFY-off:
+	${REINPLACE_CMD} -e '/inotify_init1/d ; /inotify.h/d' \
+		${WRKSRC}/meson.build
+
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gio/modules
diff --git a/devel/libinotify/Makefile b/devel/libinotify/Makefile
index 35f37a2029d9..b6b2b1247334 100644
--- a/devel/libinotify/Makefile
+++ b/devel/libinotify/Makefile
@@ -4,16 +4,19 @@ PORTNAME=	libinotify
 PORTVERSION=	20180201
 PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/libinotify-kqueue/libinotify-kqueue/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Kevent based inotify compatible library
 
 LICENSE=	MIT
 
-USES=		libtool
+USES=		autoreconf libtool
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	wulf7
+GH_PROJECT=	libinotify-kqueue
+GH_TAGNAME=	62eaa10
 
-CONFIGURE_ARGS=	--enable-skip-subfiles=fusefs,smbfs
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
diff --git a/devel/libinotify/distinfo b/devel/libinotify/distinfo
index ceb8a87bade7..f2d098276270 100644
--- a/devel/libinotify/distinfo
+++ b/devel/libinotify/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598621988
-SHA256 (libinotify-20180201.tar.gz) = 0110344305bf9ddf1019276657e656b359d4360dc94526dc6b8aa68fba688420
-SIZE (libinotify-20180201.tar.gz) = 437685
+TIMESTAMP = 1618608679
+SHA256 (wulf7-libinotify-kqueue-20180201-62eaa10_GH0.tar.gz) = 561b26a9355bab2649f7c4f139ebf60108818c8012bbd93d910f415dba1fa97f
+SIZE (wulf7-libinotify-kqueue-20180201-62eaa10_GH0.tar.gz) = 74454
diff --git a/devel/libinotify/pkg-message b/devel/libinotify/pkg-message
deleted file mode 100644
index e2862709c827..000000000000
--- a/devel/libinotify/pkg-message
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Libinotify functionality on FreeBSD is missing support for
-
-  - detecting a file being moved into or out of a directory within the
-    same filesystem
-  - certain modifications to a symbolic link (rather than the
-    file it points to.)
-
-in addition to the known limitations on all platforms using kqueue(2)
-where various open and close notifications are unimplemented.
-
-This means the following regression tests will fail:
-
-Directory notifications:
-   IN_MOVED_FROM
-   IN_MOVED_TO
-
-Open/close notifications:
-   IN_OPEN
-   IN_CLOSE_NOWRITE
-   IN_CLOSE_WRITE
-
-Symbolic Link notifications:
-   IN_DONT_FOLLOW
-   IN_ATTRIB
-   IN_MOVE_SELF
-   IN_DELETE_SELF
-
-Kernel patches to address the missing directory and symbolic link
-notifications are available from:
-
-https://github.com/libinotify-kqueue/libinotify-kqueue/tree/master/patches
-
-You might want to consider increasing the kern.maxfiles tunable if you plan
-to use this library for applications that need to monitor activity of a lot
-of files.
-EOM
-}
-]