diff --git a/sysutils/sysctlbyname-improved-kmod/Makefile b/sysutils/sysctlbyname-improved-kmod/Makefile
index e73c42f6a228..0353bf029464 100644
--- a/sysutils/sysctlbyname-improved-kmod/Makefile
+++ b/sysutils/sysctlbyname-improved-kmod/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	sysctlbyname-improved-kmod
-DISTVERSION=	20191124
-PORTREVISION=	1
+DISTVERSION=	20210223
 CATEGORIES=	sysutils
 
 MAINTAINER=	alfix86@gmail.com
-COMMENT=	Internal sysctl node to implement an improved sysctlbyname(3) clone
+COMMENT=	Internal sysctl object to implement an improved sysctlbyname(3)
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,13 +14,11 @@ USES=		kmod
 USE_GITLAB=	yes
 GL_ACCOUNT=	alfix
 GL_PROJECT=	sysctlbyname-improved
-GL_COMMIT=	522eb1f40c46a035c563f4f88594db5803ccf462
+GL_COMMIT=	1d6119756931d05cc2526308c941c979e475d3a7
 
 PLIST_FILES=	${KMODDIR}/sysctlbyname_improved.ko
 
-PORTEXAMPLES=	sysctlbyname_improved.h \
-		sysctlbyname_improved.c \
-		sysctlbyname_improved_example.c
+PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_DEFAULT=	EXAMPLES
diff --git a/sysutils/sysctlbyname-improved-kmod/distinfo b/sysutils/sysctlbyname-improved-kmod/distinfo
index ed5647c8995d..2d407479e476 100644
--- a/sysutils/sysctlbyname-improved-kmod/distinfo
+++ b/sysutils/sysctlbyname-improved-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574563228
-SHA256 (alfix-sysctlbyname-improved-522eb1f40c46a035c563f4f88594db5803ccf462_GL0.tar.gz) = 6ddf449100ed2012eeef2d770bebd58f739f9997957a073dc59e8a08022520a1
-SIZE (alfix-sysctlbyname-improved-522eb1f40c46a035c563f4f88594db5803ccf462_GL0.tar.gz) = 8680
+TIMESTAMP = 1614041021
+SHA256 (alfix-sysctlbyname-improved-1d6119756931d05cc2526308c941c979e475d3a7_GL0.tar.gz) = 0f14e112852209c194ed3ed087a7bcebe8e68cd7e598d1edf1ff85f450b7ac70
+SIZE (alfix-sysctlbyname-improved-1d6119756931d05cc2526308c941c979e475d3a7_GL0.tar.gz) = 9384
diff --git a/sysutils/sysctlbyname-improved-kmod/files/patch-sysctlinfo.h b/sysutils/sysctlbyname-improved-kmod/files/patch-sysctlinfo.h
deleted file mode 100644
index bfe62641eb04..000000000000
--- a/sysutils/sysctlbyname-improved-kmod/files/patch-sysctlinfo.h
+++ /dev/null
@@ -1,51 +0,0 @@
---- sysctlinfo.h.orig	2020-10-05 19:37:03 UTC
-+++ sysctlinfo.h
-@@ -40,27 +40,27 @@
- /* 
-  * MIB level 2, sysctlinfo identifiers
-  */
--#define ENTRYFAKENAME				7
--#define ENTRYNAME				8
--#define ENTRYDESC				9
--#define ENTRYLABEL				10
--#define ENTRYKIND				11
--#define ENTRYFMT				12
--#define ENTRYNEXTNODE				13
--#define ENTRYNEXTLEAF				14
--#define ENTRYALLINFO				15
--#define ENTRYALLINFO_WITHNEXTNODE		16
--#define ENTRYALLINFO_WITHNEXTLEAF		17
--#define ENTRYIDBYNAME				18
--#define ENTRYFAKEIDBYNAME			19
--#define ENTRYDESCBYNAME				20
--#define ENTRYLABELBYNAME			21
--#define ENTRYKINDBYNAME				22
--#define ENTRYFMTBYNAME				23
--#define ENTRYALLINFOBYNAME			24
--#define ENTRYALLINFOBYNAME_WITHNEXTNODE		25
--#define ENTRYALLINFOBYNAME_WITHNEXTLEAF		26
--#define ENTRYIDINPUTBYNAME			27
-+#define ENTRYFAKENAME				8
-+#define ENTRYNAME				9
-+#define ENTRYDESC				10
-+#define ENTRYLABEL				11
-+#define ENTRYKIND				12
-+#define ENTRYFMT				13
-+#define ENTRYNEXTNODE				14
-+#define ENTRYNEXTLEAF				15
-+#define ENTRYALLINFO				16
-+#define ENTRYALLINFO_WITHNEXTNODE		17
-+#define ENTRYALLINFO_WITHNEXTLEAF		18
-+#define ENTRYIDBYNAME				19
-+#define ENTRYFAKEIDBYNAME			20
-+#define ENTRYDESCBYNAME				21
-+#define ENTRYLABELBYNAME			22
-+#define ENTRYKINDBYNAME				23
-+#define ENTRYFMTBYNAME				24
-+#define ENTRYALLINFOBYNAME			25
-+#define ENTRYALLINFOBYNAME_WITHNEXTNODE		26
-+#define ENTRYALLINFOBYNAME_WITHNEXTLEAF		27
-+#define ENTRYIDINPUTBYNAME			28
- 
- #define SYSCTLINFO_MAXFAKENAME			64
- 
diff --git a/sysutils/sysctlbyname-improved-kmod/pkg-descr b/sysutils/sysctlbyname-improved-kmod/pkg-descr
index 7991ef91c897..bc4ce1836f93 100644
--- a/sysutils/sysctlbyname-improved-kmod/pkg-descr
+++ b/sysutils/sysctlbyname-improved-kmod/pkg-descr
@@ -1,7 +1,7 @@
-Kernel module to add the sysctl.entryidinputbyname sysctl node
-to allow to implement an improved sysctlbyname(3) clone to handle:
- * a node without a level name, e.g., "security.jail.param.allow.mount."
- * a CTLTYPE_NODE with a no-NULL handler, e.g., "kern.proc.pid.<pid>"
+Kernel module to add the sysctl.objidextended_byname sysctl object
+to implement an improved sysctlbyname(3) clone to handle:
+ * a name without a level, e.g., "security.jail.param.allow.mount."
+ * a CTLTYPE_NODE with a defined handler, e.g., "kern.proc.pid.<pid>"
 The sysctlbyname_improved() function and an example are provided, too.
 
-WWW: https://gitlab.com/alfix/sysctlbyname-improved
+WWW: https://gitlab.com/alfix/sysctlbyname-improved/