diff --git a/textproc/es-hunspell/Makefile b/textproc/es-hunspell/Makefile
index ac621266bec4..97c812b62dc4 100644
--- a/textproc/es-hunspell/Makefile
+++ b/textproc/es-hunspell/Makefile
@@ -1,19 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	hunspell
-PORTVERSION=	0.7
+PORTVERSION=	2.1.1
 CATEGORIES=	textproc spanish
-MASTER_SITES=	LOCAL/sunpoet/${PORTNAME}/
+MASTER_SITES=	https://github.com/sbosio/rla-es/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	es-
-DISTNAME=	es_any-${PORTVERSION}
+DISTNAME=	es_ANY
 EXTRACT_SUFX=	.oxt
-DIST_SUBDIR=	${PORTNAME}
+DIST_SUBDIR=	${PORTNAME}/es-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Spanish hunspell dictionaries
 
 LICENSE=	GPLv3 LGPL3 MPL
 LICENSE_COMB=	dual
+LICENSE_FILE_GPLv3=	${WRKSRC}/GPLv3.txt
+LICENSE_FILE_LGPL3=	${WRKSRC}/LGPLv3.txt
+LICENSE_FILE_MPL=	${WRKSRC}/MPL-1.1.txt
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/textproc/es-hunspell/distinfo b/textproc/es-hunspell/distinfo
index 8511c10e88c0..11454d2639c7 100644
--- a/textproc/es-hunspell/distinfo
+++ b/textproc/es-hunspell/distinfo
@@ -1,2 +1,3 @@
-SHA256 (hunspell/es_any-0.7.oxt) = a30804b7f78b2858f39ae4dc246002105838a1aa58246da6b81ab3993a79f650
-SIZE (hunspell/es_any-0.7.oxt) = 1415886
+TIMESTAMP = 1479595102
+SHA256 (hunspell/es-hunspell-2.1.1/es_ANY.oxt) = 2ef17a70a27a51df180020b63f1a87ba52fce3d0ee337f0f762279734f9f819d
+SIZE (hunspell/es-hunspell-2.1.1/es_ANY.oxt) = 1439838
diff --git a/textproc/es-hunspell/pkg-descr b/textproc/es-hunspell/pkg-descr
index d59da964bc98..a9aa3b721be4 100644
--- a/textproc/es-hunspell/pkg-descr
+++ b/textproc/es-hunspell/pkg-descr
@@ -1,3 +1,3 @@
 Spanish hunspell dictionaries
 
-WWW: http://extensions.openoffice.org/en/project/es_ANY-dicts
+WWW: https://github.com/sbosio/rla-es