diff --git a/Keywords/info.ucl b/Keywords/info.ucl
--- a/Keywords/info.ucl
+++ b/Keywords/info.ucl
@@ -1,17 +1,3 @@
 # MAINTAINER: portmgr@FreeBSD.org
 
 actions: [file]
-post-install: <<EOD
-  case "%@" in
-  /*) file="%@" ;;
-   *) file="%D/%@" ;;
-  esac
-  indexinfo ${PKG_ROOTDIR}${file%/*}
-EOD
-post-deinstall: <<EOD
-  case "%@" in
-  /*) file="%@" ;;
-   *) file="%D/%@" ;;
-  esac
-  indexinfo ${PKG_ROOTDIR}${file%/*}
-EOD
diff --git a/print/indexinfo/Makefile b/print/indexinfo/Makefile
--- a/print/indexinfo/Makefile
+++ b/print/indexinfo/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	indexinfo
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	print ports-mgmt
 
 MAINTAINER=	bapt@FreeBSD.org
@@ -9,6 +10,8 @@
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		trigger
+
 USE_CSTD=	gnu99
 USE_GITHUB=	yes
 GH_ACCOUNT=	bapt
diff --git a/print/indexinfo/files/indexinfo.ucl.in b/print/indexinfo/files/indexinfo.ucl.in
new file mode 100644
--- /dev/null
+++ b/print/indexinfo/files/indexinfo.ucl.in
@@ -0,0 +1,18 @@
+path_glob: "*/share/info/*"
+cleanup: {
+	type: lua
+	sandbox: false
+	script: <<EOS
+os.remove("%%PREFIX%%/share/info/dir")
+EOS
+}
+trigger: {
+	type: lua
+	sandbox: false
+	script: <<EOS
+print("Regenerating GNU info page index...")
+for _,path in ipairs(arg) do
+	pkg.exec({"/usr/local/bin/indexinfo", path})
+end
+EOS
+}
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	texinfo
 PORTVERSION=	7.1
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	GNU \
@@ -24,7 +24,8 @@
 		${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Locale-libintl>=0:devel/p5-Locale-libintl \
 		p5-Text-Unidecode>=0:converters/p5-Text-Unidecode \
-		p5-Unicode-EastAsianWidth>=0:textproc/p5-Unicode-EastAsianWidth
+		p5-Unicode-EastAsianWidth>=0:textproc/p5-Unicode-EastAsianWidth \
+		indexinfo:print/indexinfo
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes