diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index 63ce4bc53309..92241dbf7c81 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -1,62 +1,65 @@
 # New ports collection makefile for:	texi2html
 # Date created:				5 Nov 1997
 # Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	texi2html
 PORTVERSION=	5.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SAVANNAH
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Texinfo to HTML converter
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL}
 CONFIGURE_ARGS=	--disable-multiplatform
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 
+OPTIONS_DEFINE=	NLS DOCS
+
 PROGRAM_PREFIX?=
 PLIST_SUB=	PROGRAM_PREFIX=${PROGRAM_PREFIX} \
 		TEXINFODIR=share/texinfo
 
 .if !empty(PROGRAM_PREFIX)
 CONFIGURE_ARGS=	--program-prefix="${PROGRAM_PREFIX}"
 .endif
 
 MAN1=		${PROGRAM_PREFIX}texi2html.1
 INFO=		texi2html
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls --enable-translations
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls --disable-translations
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 pre-everything::
 	@${ECHO} ""
 	@${ECHO} "You can define the PROGRAM_PREFIX variable to change the name that"
 	@${ECHO} "the texi2html program is installed as."
 	@${ECHO} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/^translations.pl/_&/' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/^install-data/s|i18n|&/en.thl|' ${WRKSRC}/Makefile.in
 .if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e 's| install-texinfohtmlDATA||g' ${WRKSRC}/doc/Makefile.in
 .endif
 	@${REINPLACE_CMD} -e '1s|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl
 	@${CHMOD} +x ${WRKSRC}/install-sh
 
 .include <bsd.port.mk>
diff --git a/textproc/texi2html/files/patch-texi2html.pl b/textproc/texi2html/files/patch-texi2html.pl
new file mode 100644
index 000000000000..9631210cbf0b
--- /dev/null
+++ b/textproc/texi2html/files/patch-texi2html.pl
@@ -0,0 +1,14 @@
+--- texi2html.pl	2012-07-09 10:54:41.000000000 +0200
++++ /usr/local/bin/texi2html	2012-07-09 10:53:16.000000000 +0200
+@@ -1993,6 +1933,11 @@
+     # Messages should be untranslated for tests.
+     Locale::Messages::bindtextdomain ($messages_textdomain, "$datadir/locale");
+ }
++else
++{
++    unshift @INC, "$pkgdatadir/lib/libintl-perl/lib";
++    require Locale::Messages;
++}
+ 
+ sub __($)
+ {