diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index 63583a4c227b..266a253c984d 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -1,53 +1,54 @@
 # Created by: Kimura Fuyuki <fuyuki@hadaly.org>
 
 PORTNAME=	m17n-lib
 PORTVERSION=	1.8.0
 PORTREVISION=	2
 CATEGORIES=	devel textproc
 MASTER_SITES=	SAVANNAH/m17n
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Library for the multilingual text handling
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	m17n-db>=1.8.0:devel/m17n-db
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgd.so:graphics/gd \
 		libotf.so:print/libotf
 RUN_DEPENDS=	m17n-db>=1.8.0:devel/m17n-db
 
 MAKE_JOBS_UNSAFE=	yes
 
 USES=		autoreconf bison:alias gettext-tools gnome libtool pathfix pkgconfig \
 		xorg
 USE_XORG=	ice sm x11 xaw xft xmu xrender xt
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--disable-nls
+BINARY_ALIAS=	freetype-config=true
 
 OPTIONS_DEFINE=	ANTHY ISPELL THAI
 
 ANTHY_DESC=	Kana-Kanji conversion support via Anthy
 THAI_DESC=	Thai language support via libThai
 
 ANTHY_LIB_DEPENDS=	libanthy.so:japanese/anthy
 ANTHY_CONFIGURE_OFF=	--without-anthy
 
 ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_CONFIGURE_OFF=	HAVE_ISPELL=no
 
 THAI_LIB_DEPENDS=	libthai.so:devel/libthai
 THAI_CONFIGURE_OFF=	--without-libthai
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e 's|-ldl||g'
 
 .include <bsd.port.mk>
diff --git a/devel/m17n-lib/files/patch-configure.ac b/devel/m17n-lib/files/patch-configure.ac
index 0b32d968e5e0..968f65fa8498 100644
--- a/devel/m17n-lib/files/patch-configure.ac
+++ b/devel/m17n-lib/files/patch-configure.ac
@@ -1,57 +1,83 @@
---- configure.ac.orig	2014-12-10 14:22:52 UTC
+--- configure.ac.orig	2017-12-08 12:13:45 UTC
 +++ configure.ac
-@@ -106,7 +106,7 @@ if test x$with_gui != xno; then
+@@ -107,7 +107,7 @@ if test x$with_gui != xno; then
  
  dnl Checks if dlopen exists, and if it's in libc or libdl.
  
 -AC_SEARCH_LIBS(dlopen, dl,
 +AC_SEARCH_LIBS(dlopen, ,
  	       AC_DEFINE(HAVE_DLOPEN, 1,
  	       [Define to 1 if you have the function dlopen.]))
  
-@@ -342,6 +342,10 @@ LIBS="$save_LIBS"
+@@ -204,21 +204,21 @@ fi
+ AC_SUBST(OTF_LD_FLAGS)
+ 
+ dnl Check for Freetype2 usability.
+-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
++AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, pkg-config freetype2, yes)
+ if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+-  FREETYPE_INC=`freetype-config --cflags`
++  FREETYPE_INC=`pkg-config freetype2 --cflags`
+   save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
+   AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
+   			      HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS")
+   if test "x$HAVE_FREETYPE" = "xyes" ; then
+     save_LIBS="$LIBS"
+-    LIBS="$LIBS `freetype-config --libs`"
++    LIBS="$LIBS `pkg-config freetype2 --libs`"
+     AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
+     			   		     HAVE_FREETYPE=no)
+     LIBS="$save_LIBS"
+     if test "x$HAVE_FREETYPE" = "xyes"; then
+-      FREETYPE_LD_FLAGS=`freetype-config --libs`
++      FREETYPE_LD_FLAGS=`pkg-config freetype2 --libs`
+       AC_DEFINE(HAVE_FREETYPE, 1, 
+ 		[Define to 1 if you have FreeType library and header file.])
+       M17N_EXT_LIBS="$M17N_EXT_LIBS freetype"
+@@ -344,6 +344,10 @@ LIBS="$save_LIBS"
  AC_SUBST(XML2_LD_FLAGS)
  
  dnl Check for Anthy usability.
 +AC_ARG_WITH(anthy,
 +            AC_HELP_STRING([--with-anthy],
 +                           [with Anthy library (default is YES)]))
 +if test "x$with_anthy" != "xno"; then
  
  PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
  if test "x$HAVE_ANTHY" = "xyes"; then
-@@ -351,6 +355,8 @@ if test "x$HAVE_ANTHY" = "xyes"; then
+@@ -353,6 +357,8 @@ if test "x$HAVE_ANTHY" = "xyes"; then
    ANTHY_LD_FLAGS="$ANTHY_LIBS"
    CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ANTHY"
  fi
 +
 +fi
  AC_SUBST(ANTHY_LD_FLAGS)
  
  dnl Check for Ispell usability.
-@@ -365,11 +371,15 @@ dnl Check for Thai word-segmentation lib
+@@ -367,11 +373,15 @@ dnl Check for Thai word-segmentation library.
  dnl If we have one, define HAVE_THAI_WORDSEG and one of these:
  dnl   HAVE_LIBTHAI, HAVE_WORDCUT, or HAVE_WORDCUT_OLD
  dnl In addition, set THAI_WORDSEG_LD_FLAGS to a proper value.
 +AC_ARG_WITH(libthai,
 +            AC_HELP_STRING([--with-libthai],
 +                           [with libThai library (default is YES)]))
 +if test "x$with_libthai" != "xno"; then
  
  PKG_CHECK_MODULES(LIBTHAI, libthai, HAVE_LIBTHAI=yes, HAVE_LIBTHAI=no)
  PKG_CHECK_MODULES(WORDCUT, wordcut, HAVE_WORDCUT=yes, HAVE_WORDCUT=no)
  
 -if test "x$HAVE_LIBTHAI" == "xyes"; then
 +if test "x$HAVE_LIBTHAI" = "xyes"; then
  
    AC_DEFINE(HAVE_LIBTHAI, 1, [Define if you have libthai])
    THAI_WORDSEG_LD_FLAGS="$LIBTHAI_LIBS"
-@@ -425,6 +435,8 @@ if test "x$HAVE_THAI_WORDSEG" = "xyes"; 
+@@ -426,6 +436,8 @@ fi  
+ if test "x$HAVE_THAI_WORDSEG" = "xyes"; then
    AC_DEFINE(HAVE_THAI_WORDSEG, 1,
              [Define if you have some Thai word-segmentation library])
- fi
-+
 +fi
++
+ fi
  AC_SUBST(THAI_WORDSEG_LD_FLAGS)
  
- AC_SUBST(CONFIG_FLAGS)