diff --git a/textproc/elasticsearch8/Makefile b/textproc/elasticsearch8/Makefile
index 1adc4736af2f..fa00020b5734 100644
--- a/textproc/elasticsearch8/Makefile
+++ b/textproc/elasticsearch8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	elasticsearch
-PORTVERSION=	8.6.2
+PORTVERSION=	8.7.0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/
 PKGNAMESUFFIX=	8
diff --git a/textproc/elasticsearch8/distinfo b/textproc/elasticsearch8/distinfo
index 216db6e067b4..d070c17e513a 100644
--- a/textproc/elasticsearch8/distinfo
+++ b/textproc/elasticsearch8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677239595
-SHA256 (elasticsearch-8.6.2-darwin-x86_64.tar.gz) = c058f115fd66fc74bada41d1a721db52cdc421c80e218854d4f33c486eb8558a
-SIZE (elasticsearch-8.6.2-darwin-x86_64.tar.gz) = 394616903
+TIMESTAMP = 1682975761
+SHA256 (elasticsearch-8.7.0-darwin-x86_64.tar.gz) = 547583578747a83c1198bcd0fbb81e4c05c53fbbe29019e58d6f91426740cbff
+SIZE (elasticsearch-8.7.0-darwin-x86_64.tar.gz) = 406549735
diff --git a/textproc/elasticsearch8/files/patch-config_elasticsearch.yml b/textproc/elasticsearch8/files/patch-config_elasticsearch.yml
index e0bff4afd738..7a6253412e30 100644
--- a/textproc/elasticsearch8/files/patch-config_elasticsearch.yml
+++ b/textproc/elasticsearch8/files/patch-config_elasticsearch.yml
@@ -1,25 +1,23 @@
---- config/elasticsearch.yml.orig	2022-11-17 18:55:38 UTC
+--- config/elasticsearch.yml.orig	2023-05-01 21:34:56 UTC
 +++ config/elasticsearch.yml
-@@ -31,10 +31,12 @@
+@@ -30,11 +30,11 @@
+ #
  # Path to directory where to store the data (separate multiple locations by comma):
  #
- #path.data: /path/to/data
+-#path.data: /path/to/data
 +path.data: /var/db/elasticsearch
  #
  # Path to log files:
  #
- #path.logs: /path/to/logs
-+path.logs: /var/log/elasticsearch
+-#path.logs: /path/to/logs
++path.logs: /var/run/elasticsearch
  #
  # ----------------------------------- Memory -----------------------------------
  #
-@@ -80,6 +82,9 @@
- # Enable an unauthenticated TCP readiness endpoint on localhost
+@@ -80,3 +80,6 @@
+ # Allow wildcard deletion of indices:
  #
- #readiness.port: 9399
-+
+ #action.destructive_requires_name: false
++#
 +# ml is not supported on FreeBSD
 +xpack.ml.enabled: false
- #
- # ---------------------------------- Various -----------------------------------
- #