diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 34a4a9312190..8505be37e002 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -1,61 +1,60 @@
 PORTNAME=	link-grammar
 DISTVERSION=	5.10.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	https://www.gnucash.org/${PORTNAME}/downloads/${PORTVERSION}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Grammar checking library
-WWW=		https://www.abisource.com/projects/link-grammar/
+WWW=		https://opencog.github.io/link-grammar-website/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++11-lib dos2unix gmake libtool localbase ncurses \
 		pathfix pkgconfig sqlite
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-maintainer-mode \
 		--with-regexlib=pcre2 \
 		--disable-python-bindings
 
 INSTALL_TARGET=	install-strip
 
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 OPTIONS_SUB=		yes
 OPTIONS_DEFINE=		EDITLINE JAVA PERL SAT_SOLVER PYTHON
 OPTIONS_DEFAULT=	EDITLINE HUNSPELL SAT_SOLVER
 
 OPTIONS_MULTI=			SPELL
 OPTIONS_MULTI_SPELL=		ASPELL HUNSPELL
 
 ASPELL_CONFIGURE_ENABLE=	aspell
 ASPELL_LIB_DEPENDS=		libaspell.so:textproc/aspell
 
 EDITLINE_CONFIGURE_ENABLE=	editline
 EDITLINE_DESC=			Command line editing
 EDITLINE_USES=			libedit
 
 HUNSPELL_CONFIGURE_ENABLE=	hunspell
 HUNSPELL_LIB_DEPENDS=		libhunspell-1.7.so:textproc/hunspell
 
 JAVA_CONFIGURE_ENABLE=		java-bindings
 JAVA_USE=			JAVA
 JAVA_CPPFLAGS=			-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 
 PERL_CONFIGURE_ENABLE=		perl-bindings
 PERL_LDFLAGS=			-L${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE -lperl
 PERL_USES=			perl5
 
 SAT_SOLVER_CONFIGURE_ENABLE=	sat-solver
 SAT_SOLVER_DESC=		Use boolean SAT parser
 SAT_SOLVER_LIB_DEPENDS=		libminisat.so:math/minisat
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblink-grammar.so.${DISTVERSION}  # see https://github.com/opencog/link-grammar/issues/645
 
 .include <bsd.port.mk>
diff --git a/textproc/link-grammar/files/patch-configure b/textproc/link-grammar/files/patch-configure
new file mode 100644
index 000000000000..55b6215f112d
--- /dev/null
+++ b/textproc/link-grammar/files/patch-configure
@@ -0,0 +1,31 @@
+Derived from https://github.com/opencog/link-grammar/commit/8d864c6a7b91
+
+--- configure.orig	2022-06-17 16:29:31 UTC
++++ configure
+@@ -18540,8 +18540,26 @@ fi
+   OS_NETBSD_FALSE=
+ fi
+ 
++case "$host_os" in
++  *freebsd*)
++    freebsd=yes
++    ;;
++  *)
++    freebsd=no
++    ;;
++esac
+ 
+ HOST_OS="$host_os"
++
++# ====================================================================
++# FreeBSD work-around. Apparently, the AX_PTHREAD autoconf macro
++# fails to include -lstdthreads in it's results. See bug report
++# https://github.com/opencog/link-grammar/issues/1355
++# So we hack, and explicitly set it here.
++
++if test -n "$ax_pthread_ok" -a "x$freebsd" = "xyes"; then
++	PTHREAD_LIBS="${PTHREAD_LIBS} -lstdthreads"
++fi
+ 
+ # ====================================================================
+