diff --git a/textproc/redisearch/Makefile b/textproc/redisearch/Makefile
index 27beeae737ff..59c9dfc4c97b 100644
--- a/textproc/redisearch/Makefile
+++ b/textproc/redisearch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	redisearch
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.27
+DISTVERSION=	1.6.12
 CATEGORIES=	textproc
 
 MAINTAINER=	osa@FreeBSD.org
@@ -14,7 +14,7 @@ LICENSE_NAME=	Redis Source Available License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-USES=		cmake compiler:c++11-lang
+USES=		cmake compiler
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	RediSearch
diff --git a/textproc/redisearch/distinfo b/textproc/redisearch/distinfo
index a33fe8e2f762..71124e8b269e 100644
--- a/textproc/redisearch/distinfo
+++ b/textproc/redisearch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586955959
-SHA256 (RediSearch-RediSearch-v1.4.27_GH0.tar.gz) = 92f51d5a0ce4fb5ff22dbc4da3b24d700dd247460607abd2902493bedff85749
-SIZE (RediSearch-RediSearch-v1.4.27_GH0.tar.gz) = 3575961
+TIMESTAMP = 1587566660
+SHA256 (RediSearch-RediSearch-v1.6.12_GH0.tar.gz) = 143e97c9354f7dfb2b1a0e3c5a23256130e23204abf643826fe9c44dcd62bc6c
+SIZE (RediSearch-RediSearch-v1.6.12_GH0.tar.gz) = 3669819
diff --git a/textproc/redisearch/files/patch-src_fork__gc.c b/textproc/redisearch/files/patch-src_fork__gc.c
new file mode 100644
index 000000000000..9b067f73f84d
--- /dev/null
+++ b/textproc/redisearch/files/patch-src_fork__gc.c
@@ -0,0 +1,21 @@
+--- src/fork_gc.c.orig	2020-04-12 11:18:47 UTC
++++ src/fork_gc.c
+@@ -282,6 +282,7 @@ done:
+ }
+ 
+ static void sendHeaderString(ForkGC *gc, void *arg) {
++  struct iovec { void *iov_base; size_t iov_len; };
+   struct iovec *iov = arg;
+   FGC_sendBuffer(gc, iov->iov_base, iov->iov_len);
+ }
+@@ -298,7 +299,9 @@ static void FGC_childCollectTerms(ForkGC *gc, RedisSea
+     RedisModuleKey *idxKey = NULL;
+     InvertedIndex *idx = Redis_OpenInvertedIndexEx(sctx, term, strlen(term), 1, &idxKey);
+     if (idx) {
+-      struct iovec iov = {.iov_base = (void *)term, termLen};
++      struct iovec { void *iov_base; size_t iov_len; } iov;
++      iov.iov_base = term;
++      iov.iov_len = termLen;
+       FGC_childRepairInvidx(gc, sctx, idx, sendHeaderString, &iov, NULL);
+     }
+     if (idxKey) {