diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
index 0d1d275..1ef7ea5 100644
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@@ -10,14 +10,19 @@ PATCHDIR=	${.CURDIR}/../../devel/gettext/patches
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		xz:run
-USE_PKGLOCALEDIR=	yes
+#USE_TOOLS+=		autoconf pkg-config	# for test
+CONFIGURE_ARGS+=	--program-prefix=g
 CONFIGURE_ARGS+=	--disable-csharp
+CONFIGURE_ARGS+=	--with-included-glib
 CONFIGURE_ARGS+=	--with-included-libcroco
+CONFIGURE_ARGS+=	--with-included-libxml
+CONFIGURE_ARGS+=	--with-included-libunistring
 CONFIGURE_ARGS+=	--without-git
 CONFIGURE_ARGS+=	--with-xz
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--without-emacs
 CONFIGURE_ARGS+=	--disable-openmp
+CONFIGURE_ARGS+=	--disable-java
 CONFIGURE_ENV+=		GCJ= ac_cv_prog_GCJ= ac_cv_prog_JAR=
 CONFIGURE_ENV+=		HAVE_GCJ_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JAVAC_IN_PATH=
@@ -40,14 +45,51 @@ BUILDLINK_TRANSFORM+=	rm:-Wl,--disable-auto-import
 CONFIGURE_ENV+= ac_cv_header_wctype_h=no
 .endif
 
+#TEST_TARGET=	check
+
+#REPLACE_SH+=		gettext-tools/tests/*
+
+SUBST_CLASSES+=	tests
+SUBST_STAGE.tests=	pre-configure
+SUBST_FILES.tests=	gettext-tools/tests/lang-c++
+SUBST_SED.tests=	-e 's,[^ ]*libasprintf.la,-lasprintf,'
+
+pre-test: stage-install	# needed for archive.dir.tar.xz
+
+SYMLINK_FILES = gettext ngettext envsubst gettext.sh msgcmp msgfmt msgmerge \
+		msgunfmt xgettext msgattrib msgcat msgcomm msgconv msgen \
+		msgexec msgfilter msggrep msginit msguniq recode-sr-latin \
+		gettextize autopoint
+
+SYMLINK_MANFILES= autopoint.1 envsubst.1 gettext.1 gettextize.1 msgattrib.1 \
+		msgcat.1 msgcmp.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 \
+		msgfilter.1 msgfmt.1 msggrep.1 msginit.1 msgmerge.1 msgunfmt.1 \
+		msguniq.1 ngettext.1 recode-sr-latin.1 xgettext.1
+
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
+
 post-install:
 	cd ${WRKSRC}/gettext-tools/misc && ${MAKE} install DESTDIR=${DESTDIR}
-	${INSTALL_MAN} ${WRKSRC}/gettext-tools/man/autopoint.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/gettext-tools/man/gettextize.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.for f in ${SYMLINK_FILES}
+	if [ -f ${DESTDIR}${PREFIX}/bin/g${f:Q} ]; then \
+	    ${LN} -sf ${PREFIX}/bin/g${f} \
+		${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}; \
+	fi
+.endfor
+.for f in ${SYMLINK_MANFILES}
+	if [ -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f:Q} ]; then \
+	    ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f} \
+		${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}; \
+	fi
+.endfor
 
+#BUILDLINK_DEPMETHOD.gettext-asprintf=	build	# needed for test
+#.include "../../devel/gettext-asprintf/buildlink3.mk"
+#BUILDLINK_DEPMETHOD.glib2=	build		# needed for test
+#.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+#BUILDLINK_DEPMETHOD.vala=	build		# needed for test
+#.include "../../lang/vala/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext-tools/PLIST b/devel/gettext-tools/PLIST
index 71ddc16..3e8556b 100644
--- a/devel/gettext-tools/PLIST
+++ b/devel/gettext-tools/PLIST
@@ -1,26 +1,69 @@
 @comment $NetBSD: PLIST,v 1.12 2015/09/30 20:58:32 wiz Exp $
-bin/autopoint
-bin/envsubst
-bin/gettext
-bin/gettext.sh
-bin/gettextize
-bin/msgattrib
-bin/msgcat
-bin/msgcmp
-bin/msgcomm
-bin/msgconv
-bin/msgen
-bin/msgexec
-bin/msgfilter
-bin/msgfmt
-bin/msggrep
-bin/msginit
-bin/msgmerge
-bin/msgunfmt
-bin/msguniq
-bin/ngettext
-bin/recode-sr-latin
-bin/xgettext
+bin/gautopoint
+bin/genvsubst
+bin/ggettext
+bin/ggettext.sh
+bin/ggettextize
+bin/gmsgattrib
+bin/gmsgcat
+bin/gmsgcmp
+bin/gmsgcomm
+bin/gmsgconv
+bin/gmsgen
+bin/gmsgexec
+bin/gmsgfilter
+bin/gmsgfmt
+bin/gmsggrep
+bin/gmsginit
+bin/gmsgmerge
+bin/gmsgunfmt
+bin/gmsguniq
+bin/gngettext
+bin/grecode-sr-latin
+bin/gxgettext
+gnu/bin/autopoint
+gnu/bin/envsubst
+gnu/bin/gettext
+gnu/bin/gettext.sh
+gnu/bin/gettextize
+gnu/bin/msgattrib
+gnu/bin/msgcat
+gnu/bin/msgcmp
+gnu/bin/msgcomm
+gnu/bin/msgconv
+gnu/bin/msgen
+gnu/bin/msgexec
+gnu/bin/msgfilter
+gnu/bin/msgfmt
+gnu/bin/msggrep
+gnu/bin/msginit
+gnu/bin/msgmerge
+gnu/bin/msgunfmt
+gnu/bin/msguniq
+gnu/bin/ngettext
+gnu/bin/recode-sr-latin
+gnu/bin/xgettext
+gnu/man/man1/autopoint.1
+gnu/man/man1/envsubst.1
+gnu/man/man1/gettext.1
+gnu/man/man1/gettextize.1
+gnu/man/man1/msgattrib.1
+gnu/man/man1/msgcat.1
+gnu/man/man1/msgcmp.1
+gnu/man/man1/msgcomm.1
+gnu/man/man1/msgconv.1
+gnu/man/man1/msgen.1
+gnu/man/man1/msgexec.1
+gnu/man/man1/msgfilter.1
+gnu/man/man1/msgfmt.1
+gnu/man/man1/msggrep.1
+gnu/man/man1/msginit.1
+gnu/man/man1/msgmerge.1
+gnu/man/man1/msgunfmt.1
+gnu/man/man1/msguniq.1
+gnu/man/man1/ngettext.1
+gnu/man/man1/recode-sr-latin.1
+gnu/man/man1/xgettext.1
 include/gettext-po.h
 info/gettext.info
 lib/gettext/cldr-plurals
@@ -31,27 +74,27 @@ lib/gettext/user-email
 lib/libgettextlib.la
 lib/libgettextpo.la
 lib/libgettextsrc.la
-man/man1/autopoint.1
-man/man1/envsubst.1
-man/man1/gettext.1
-man/man1/gettextize.1
-man/man1/msgattrib.1
-man/man1/msgcat.1
-man/man1/msgcmp.1
-man/man1/msgcomm.1
-man/man1/msgconv.1
-man/man1/msgen.1
-man/man1/msgexec.1
-man/man1/msgfilter.1
-man/man1/msgfmt.1
-man/man1/msggrep.1
-man/man1/msginit.1
-man/man1/msgmerge.1
-man/man1/msgunfmt.1
-man/man1/msguniq.1
-man/man1/ngettext.1
-man/man1/recode-sr-latin.1
-man/man1/xgettext.1
+man/man1/gautopoint.1
+man/man1/genvsubst.1
+man/man1/ggettext.1
+man/man1/ggettextize.1
+man/man1/gmsgattrib.1
+man/man1/gmsgcat.1
+man/man1/gmsgcmp.1
+man/man1/gmsgcomm.1
+man/man1/gmsgconv.1
+man/man1/gmsgen.1
+man/man1/gmsgexec.1
+man/man1/gmsgfilter.1
+man/man1/gmsgfmt.1
+man/man1/gmsggrep.1
+man/man1/gmsginit.1
+man/man1/gmsgmerge.1
+man/man1/gmsgunfmt.1
+man/man1/gmsguniq.1
+man/man1/gngettext.1
+man/man1/grecode-sr-latin.1
+man/man1/gxgettext.1
 man/man3/bind_textdomain_codeset.3
 man/man3/bindtextdomain.3
 man/man3/dcgettext.3