diff --git a/textproc/hyphen/Makefile b/textproc/hyphen/Makefile
index 575d6b9b530f..6aac92db1e2d 100644
--- a/textproc/hyphen/Makefile
+++ b/textproc/hyphen/Makefile
@@ -9,12 +9,11 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library for high quality hyphenation and justification
 
-LICENSE=	LGPL21 LGPL3 MPL
+LICENSE=	LGPL21+ MPL
 LICENSE_COMB=	dual
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
+LICENSE_FILE_MPL=	${WRKSRC}/COPYING.MPL
 
-BUILD_DEPENDS=	gawk:lang/gawk
-
-CONFIGURE_ENV=	ac_cv_prog_AWK=gawk
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix perl5 shebangfix
 USE_LDCONFIG=	yes
diff --git a/textproc/hyphen/files/patch-lig.awk b/textproc/hyphen/files/patch-lig.awk
new file mode 100644
index 000000000000..0c45ac60678e
--- /dev/null
+++ b/textproc/hyphen/files/patch-lig.awk
@@ -0,0 +1,29 @@
+--- lig.awk.orig	2010-03-04 12:13:47 UTC
++++ lig.awk
+@@ -24,14 +24,20 @@ c=b
+ c!=b { print c }
+ 
+ /f[1-9]?$/ {
+-	print gensub("f[1-9]?$", "ff", "g", b);
+-	if (c!=b) print gensub("f[1-9]?$", "ff", "g", c);
++	out=b; gsub("f[1-9]?$", "ff", out); print out
++	if (c!=b) {
++		out=c; gsub("f[1-9]?$", "ff", out); print out
++	}
+ 
+-	print gensub("f[1-9]?$", "fi", "g", b);
+-	if (c!=b) print gensub("f[1-9]?$", "fi", "g", c);
++	out=b; gsub("f[1-9]?$", "fi", out); print out
++	if (c!=b) {
++		out=c; gsub("f[1-9]?$", "fi", out); print out
++	}
+ 
+-	print gensub("f[1-9]?$", "fl", "g", b);
+-	if (c!=b) print gensub("f[1-9]?$", "fl", "g", c);
++	out=b; gsub("f[1-9]?$", "fl", out); print out
++	if (c!=b) {
++		out=c; gsub("f[1-9]?$", "fl", out); print out
++	}
+ }
+ 
+ 
diff --git a/textproc/hyphen/pkg-descr b/textproc/hyphen/pkg-descr
index 527d806cd470..06d27b6e5fdc 100644
--- a/textproc/hyphen/pkg-descr
+++ b/textproc/hyphen/pkg-descr
@@ -1,3 +1,3 @@
 Hyphen - hyphenation library to use converted TeX hyphenation patterns
 
-WWW: http://hunspell.sourceforge.net
+WWW: https://github.com/hunspell/hyphen