diff --git a/www/py-django-haystack/Makefile b/www/py-django-haystack/Makefile
index f2a4e4e4225a..d62e9f334276 100644
--- a/www/py-django-haystack/Makefile
+++ b/www/py-django-haystack/Makefile
@@ -1,35 +1,39 @@
 # Created by: Kristaps Kulis <kristaps.kulis@gmail.com>
 
 PORTNAME=	django-haystack
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	3.1.1
 CATEGORIES=	www databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kristaps.kulis@gmail.com
 COMMENT=	Pluggable search for Django
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFINE=		DOCS ELASTIC
+OPTIONS_DEFAULT=	ELASTIC
+
+ELASTIC_DESC=	Enable Elasticsearch support
+
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
+ELASTIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}elasticsearch5>=5<6:textproc/py-elasticsearch5@${PY_FLAVOR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/build/sphinx/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! -name .buildinfo -and ! -name objects.inv")
 
 .include <bsd.port.mk>
diff --git a/www/py-django-haystack/distinfo b/www/py-django-haystack/distinfo
index 4bfbceb02f10..ae81c8974d40 100644
--- a/www/py-django-haystack/distinfo
+++ b/www/py-django-haystack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525986110
-SHA256 (django-haystack-2.8.1.tar.gz) = 8b54bcc926596765d0a3383d693bcdd76109c7abb6b2323b3984a39e3576028c
-SIZE (django-haystack-2.8.1.tar.gz) = 1553122
+TIMESTAMP = 1642337783
+SHA256 (django-haystack-3.1.1.tar.gz) = 6d05756b95d7d5ec1dbd4668eb999ced1504b47f588e2e54be53b1404c516a82
+SIZE (django-haystack-3.1.1.tar.gz) = 467122