diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index 60d825a578a8..9500cc1213ac 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -6,49 +6,61 @@
 #
 
 PORTNAME=	fhist
-PORTVERSION=	1.17
-PORTREVISION=	1
+PORTVERSION=	1.19
 CATEGORIES=	devel
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities to maintain file history, do file comparisions and merges
 
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	explain.45:${PORTSDIR}/devel/libexplain
+
+OPTIONS=	NLS "Native language support" on
+
 GNU_CONFIGURE=	yes
-ALL_TARGET=	binaries po
-MAKE_JOBS_UNSAFE=	yes
+ALL_TARGET=	all-bin
+MAKE_JOBS_UNSAFE=yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		fcomp.1 fhist.1 fmerge.1
 PLIST_FILES=	bin/fcomp bin/fhist bin/fmerge
 
-CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	ac_cv_lib_intl_main=no
+CONFIGURE_ENV+=	ac_cv_lib_intl_main=no
 .else
 USE_GETTEXT=	yes
-PLIST_FILES+=	share/locale/en/LC_MESSAGES/fcomp.mo \
-		share/locale/en/LC_MESSAGES/fhist.mo \
-		share/locale/en/LC_MESSAGES/fmerge.mo
+.for file in fcomp fhist fmerge
+PLIST_FILES+=	share/locale/en/LC_MESSAGES/${file}.mo
+.endfor
 .endif
 
-post-extract:
-	cd ${WRKSRC}/lib/en/man1 && ${LN} -s ${WRKSRC}/etc/*.so .
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|.a $$(LIBS)|.a $$(LDFLAGS) $$(LIBS)|' ${WRKSRC}/Makefile.in
 
-do-install:
-.for file in fhist fcomp fmerge
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/bin/${file}
-	(cd ${WRKSRC}/lib/en/man1; soelim ${file}.1 > tmp; \
-	${INSTALL_MAN} tmp ${PREFIX}/man/man1/${file}.1)
+post-build:
+.for file in fcomp fhist fmerge
 .if !defined(WITHOUT_NLS)
-	@${MKDIR} ${PREFIX}/share/locale/en/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/lib/en/LC_MESSAGES/${file}.mo \
-		 ${PREFIX}/share/locale/en/LC_MESSAGES/${file}.mo
+	@(cd ${WRKSRC}/lib/en/LC_MESSAGES && ${LOCALBASE}/bin/msgfmt -o \
+		${file}.mo ${file}.po)
 .endif
 .endfor
 
-.include <bsd.port.post.mk>
+do-install:
+.for file in fcomp fhist fmerge
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/lib/en/man1/${file}.1 ${MANPREFIX}/man/man1
+.if !defined(WITHOUT_NLS)
+	@${MKDIR} ${PREFIX}/share/locale/en/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/lib/en/LC_MESSAGES/${file}.mo \
+		${PREFIX}/share/locale/en/LC_MESSAGES
+.endif
+.endfor
+
+.include <bsd.port.mk>
diff --git a/devel/fhist/distinfo b/devel/fhist/distinfo
index 5d4ccee3ab5e..b5fb13ea5510 100644
--- a/devel/fhist/distinfo
+++ b/devel/fhist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fhist-1.17.tar.gz) = e1e06a095913e9d9afc2deb89f646d96dd03d2d832669018f3cc519fffb98e1e
-SIZE (fhist-1.17.tar.gz) = 401116
+SHA256 (fhist-1.19.tar.gz) = f1bffa44b4252d88c70e208a813aad8fac2d668b43e8e1cb6e823d89a4f4e265
+SIZE (fhist-1.19.tar.gz) = 409075