diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index d664a8d42de8..f37b4c3d8d8b 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -13,8 +13,10 @@ MASTER_SITES=	http://www.io.com/~kazushi/less/ \
 MASTER_SITE_SUBDIR=	less
 DISTNAME=	less-${PORTVERSION:R}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${XGTAGS}${EXTRACT_SUFX} \
 		regex_cs-lwp9k.shar.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
+		${XGTAGS}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://www.io.com/~kazushi/less/
 PATCHFILES=	${DISTNAME}-iso${PORTVERSION:E}.patch.gz
@@ -29,16 +31,19 @@ MAN1=		jless.1 jlesskey.1
 
 DOCDIR=		${PREFIX}/share/doc/less
 READMES=	README.iso README.regex README.iso.jp README.regex.jp
+XGTAGS=		${DISTNAME}-iso${PORTVERSION:E}+gtags
 
 post-patch:
-		(cd ${WRKSRC} ; \
+	(cd ${WRKSRC} ; \
 	 ${RM} -f configure COPYING; \
 	 ${GZCAT} ${DISTDIR}/regex_cs-lwp9k.shar.gz | ${SH} )
+	${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/${XGTAGS}/${XGTAGS}.diff
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCDIR}
 	(cd ${WRKSRC}; ${INSTALL_DATA} ${READMES} ${DOCDIR})
+	${INSTALL_DATA} ${WRKDIR}/${XGTAGS}/README ${DOCDIR}/README.gtags
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/less/distinfo b/japanese/less/distinfo
index 258328c18fd8..d8a6e47b087a 100644
--- a/japanese/less/distinfo
+++ b/japanese/less/distinfo
@@ -1,3 +1,4 @@
 MD5 (less-358.tar.gz) = 692a94060a50dd35a4d65176cb899444
 MD5 (regex_cs-lwp9k.shar.gz) = 2218027bfdb7acf3c1a052ed48a6d48b
+MD5 (less-358-iso254+gtags.tar.gz) = 276e7e0e862310878e8c207826d6ffe7
 MD5 (less-358-iso254.patch.gz) = 4ccb02cfcdd9aafc2b147d56c895716a
diff --git a/japanese/less/files/patch-ac b/japanese/less/files/patch-ac
index d5ba2b6fe4f9..6ecc724ccb6b 100644
--- a/japanese/less/files/patch-ac
+++ b/japanese/less/files/patch-ac
@@ -5,4 +5,4 @@
  */
  
 -char version[] = "358+iso254";
-+char version[] = "358+iso254+regex_cs-lwp9k";
++char version[] = "358+iso254+regex_cs-lwp9k+gtags";
diff --git a/japanese/less/pkg-plist b/japanese/less/pkg-plist
index 5d23a47e57be..fbf588bb94e8 100644
--- a/japanese/less/pkg-plist
+++ b/japanese/less/pkg-plist
@@ -1,6 +1,7 @@
 bin/jless
 bin/jlesskey
 bin/jlessecho
+share/doc/less/README.gtags
 share/doc/less/README.iso
 share/doc/less/README.iso.jp
 share/doc/less/README.regex