diff --git a/sysutils/graylog/Makefile b/sysutils/graylog/Makefile
index ca7833fa92ae..84da0ce37d27 100644
--- a/sysutils/graylog/Makefile
+++ b/sysutils/graylog/Makefile
@@ -1,66 +1,75 @@
 # Created by: Thomas Bartelmess <thomas@bartelmess.io>
 
 PORTNAME=	graylog
-DISTVERSION=	4.1.2
+DISTVERSION=	4.1.3
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.graylog.org/releases/
 DISTFILES=	graylog/${DISTNAME}${EXTRACT_SUFX} \
 		graylog-integrations/graylog-integrations-plugins-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Tool for centralized log collection
 
 LICENSE=	SSPLv1 APACHE20
 LICENSE_COMB=	multi
 LICENSE_NAME_SSPLv1=	Server Side Public License
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		tar:tgz
 USE_JAVA=	yes
 
 JAVA_VERSION=	1.8+
 JAVA_EXTRACT=	yes
 JAVA_RUN=	yes
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_RC_SUBR=	graylog
 SUB_FILES=	log4j2.xml pkg-message
 
 GRAYLOGUSER?=	graylog
 GRAYLOGGROUP?=	${GRAYLOGUSER}
 USERS=		${GRAYLOGUSER}
 GROUPS=		${GRAYLOGGROUP}
 GRAYLOG_DATA_DIR=	/var/db/graylog
 GRAYLOG_LOGS_DIR=	/var/log/graylog
 
 SUB_LIST=	GRAYLOGUSER=${GRAYLOGUSER} \
 		GRAYLOGGROUP=${GRAYLOGGROUP} \
 		GRAYLOG_LOGS_DIR=${GRAYLOG_LOGS_DIR} \
 		GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR}
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION} \
 		GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \
 		GRAYLOG_LOGS_DIR=${GRAYLOG_LOGS_DIR} \
 		GRAYLOGUSER=${GRAYLOGUSER} \
 		GRAYLOGGROUP=${GRAYLOGGROUP} \
 		PORTNAME=${PORTNAME}
 
+post-extract:
+	${REINPLACE_CMD} -E \
+		-e 's,^bin_dir .+,bin_dir = ${LOCALBASE}/share/graylog/bin,' \
+		-e 's,^data_dir .+,data_dir = /var/db/graylog,' \
+		-e 's,^message_journal_dir .+,message_journal_dir = ${GRAYLOG_DATA_DIR}/journal,' \
+		-e 's,^node_id_file .+,node_id_file = ${ETCDIR}/server/node-id,' \
+		-e 's,^plugin_dir .+,plugin_dir = ${LOCALBASE}/share/graylog/plugin,' \
+	${WRKSRC}/graylog.conf.example
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugin
-	@${MKDIR} ${STAGEDIR}${ETCDIR}
-	@${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/server
+	@${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR}/journal
 	@${MKDIR} ${STAGEDIR}${GRAYLOG_LOGS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/graylog.conf.example \
 		${STAGEDIR}${ETCDIR}/graylog.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/log4j2.xml \
 		${STAGEDIR}${ETCDIR}/log4j2.xml.sample
 	cd ${WRKDIR}/graylog-integrations-plugins-${DISTVERSION}/plugin && \
 	    ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/
 	cd ${WRKSRC}/plugin && \
 	    ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/
 
 .include <bsd.port.mk>
diff --git a/sysutils/graylog/distinfo b/sysutils/graylog/distinfo
index 9597bf62fbff..6df339d3e773 100644
--- a/sysutils/graylog/distinfo
+++ b/sysutils/graylog/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1627499684
-SHA256 (graylog/graylog-4.1.2.tgz) = befdebb2c759ab6b1a17f8c918e989dedc174af8c14befd549a6c05d797934dc
-SIZE (graylog/graylog-4.1.2.tgz) = 197078255
-SHA256 (graylog-integrations/graylog-integrations-plugins-4.1.2.tgz) = 8ca7d63743ce4c6aaebb73522376d315556f44c0b05c326c2b5f53ae7a96734f
-SIZE (graylog-integrations/graylog-integrations-plugins-4.1.2.tgz) = 29495666
+TIMESTAMP = 1628761882
+SHA256 (graylog/graylog-4.1.3.tgz) = 516b32cc3f6888bbbdedfa1c3d722a5413da658257de6be7eb9adf2fb404ac83
+SIZE (graylog/graylog-4.1.3.tgz) = 197149916
+SHA256 (graylog-integrations/graylog-integrations-plugins-4.1.3.tgz) = 5e603130abf8a9f8181504035653c98f4297c13041363850c82386b0fe33ee6c
+SIZE (graylog-integrations/graylog-integrations-plugins-4.1.3.tgz) = 29497807
diff --git a/sysutils/graylog/pkg-plist b/sysutils/graylog/pkg-plist
index bc732afc68cb..dca62c13b94f 100644
--- a/sysutils/graylog/pkg-plist
+++ b/sysutils/graylog/pkg-plist
@@ -1,12 +1,13 @@
 %%DATADIR%%/graylog.jar
 %%DATADIR%%/plugin/%%PORTNAME%%-plugin-aws-%%DISTVERSION%%.jar
 %%DATADIR%%/plugin/%%PORTNAME%%-plugin-collector-%%DISTVERSION%%.jar
 %%DATADIR%%/plugin/%%PORTNAME%%-plugin-integrations-%%DISTVERSION%%.jar
 %%DATADIR%%/plugin/%%PORTNAME%%-plugin-threatintel-%%DISTVERSION%%.jar
 %%DATADIR%%/plugin/%%PORTNAME%%-storage-elasticsearch6-%%DISTVERSION%%.jar
 %%DATADIR%%/plugin/%%PORTNAME%%-storage-elasticsearch7-%%DISTVERSION%%.jar
-@dir %%ETCDIR%%
+@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%ETCDIR%%/server
 @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%%
+@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%%/journal
 @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_LOGS_DIR%%
 @sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.sample
 @sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.sample