diff --git a/textproc/meilisearch/Makefile b/textproc/meilisearch/Makefile
index 2fa7aa46b97a..8eeb69c98f63 100644
--- a/textproc/meilisearch/Makefile
+++ b/textproc/meilisearch/Makefile
@@ -1,64 +1,66 @@
 PORTNAME=	meilisearch
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.31.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/meilisearch/mini-dashboard/releases/download/v${DASHBOARD_VERSION}/build.zip?dummy=/:mini_dashboard_assets \
 		https://Lindera.dev/:dic_upstream \
 		https://milli-benchmarks.fra1.digitaloceanspaces.com/datasets/:benchmark
 DISTFILES=	${MINIDASHBOARDFILE}:mini_dashboard_assets \
 		mecab-ipadic-2.7.0-20070801.tar.gz:dic_upstream \
 		unidic-mecab-2.1.2.tar.gz:dic_upstream \
 		mecab-ko-dic-2.1.1-20180720.tar.gz:dic_upstream \
 		mecab-ipadic-neologd-0.0.7-20200820.tar.gz:dic_upstream \
 		smol-songs.csv.gz:benchmark \
 		smol-songs-1_2.csv.gz:benchmark \
 		smol-songs-3_4.csv.gz:benchmark \
 		smol-songs-4_4.csv.gz:benchmark \
 		smol-wiki-articles.csv.gz:benchmark \
 		smol-wiki-articles-1_2.csv.gz:benchmark \
 		smol-wiki-articles-3_4.csv.gz:benchmark \
 		smol-wiki-articles-4_4.csv.gz:benchmark \
 		movies.json.gz:benchmark \
 		movies-1_2.json.gz:benchmark \
 		movies-3_4.json.gz:benchmark \
 		movies-4_4.json.gz:benchmark \
 		nested_movies.json.gz:benchmark \
 		smol-all-countries.jsonl.gz:benchmark
 EXTRACT_ONLY=	${DISTFILES:N*\:benchmark:N*\:dic_upstream:C/:.*//}
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Powerful, fast, and an easy to use search engine
 WWW=		https://www.meilisearch.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	libgit2>=0:devel/libgit2
-LIB_DEPENDS=	libzstd.so:archivers/zstd \
-		libonig.so:devel/oniguruma
+LIB_DEPENDS=	libonig.so:devel/oniguruma \
+		libzstd.so:archivers/zstd
 
 BROKEN_i386=	fails to build
 USES=		cargo pkgconfig
 USE_GITHUB=	yes
+USE_RC_SUBR=	${PORTNAME}
 
 #GH_TUPLE=		meilisearch:lmdb:6a01c0a:lmdb/../lmdb-rs-501aa34a1ab7f092e3ff54a6c22ff6c55931a2d8/lmdb-sys/lmdb
 DASHBOARD_VERSION=	0.2.22
 MINIDASHBOARDFILE=	meilisearch-mini-dashboard-build-${DASHBOARD_VERSION}.zip
 CARGO_INSTALL_PATH=	crates/meilisearch
 CARGO_ENV=		LIBGIT2_SYS_USE_PKG_CONFIG=1 \
 			MILLI_BENCH_DATASETS_PATH=${WRKDIR}
 PLIST_FILES=		bin/${PORTNAME}
 
 post-extract:
 .for F in ${DISTFILES:M*\:benchmark:S/:benchmark//}
 	@${GUNZIP} < ${DISTDIR}/${F} >${WRKDIR}/${F:S/.gz//}
 .endfor
 
 post-patch:
 	${REINPLACE_CMD} -e 's,%%MINIDASHBOARDFILE%%,${DISTDIR}/${MINIDASHBOARDFILE},'  \
 		${WRKSRC}/crates/meilisearch/build.rs
 	${GREP} -E -R -l '%%(WRK|DIST)DIR%%' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's,%%WRKDIR%%,${WRKDIR},' \
 		-e 's,%%DISTDIR%%,${DISTDIR},'
 
 .include <bsd.port.mk>
diff --git a/textproc/meilisearch/files/meilisearch.in b/textproc/meilisearch/files/meilisearch.in
new file mode 100644
index 000000000000..93fc588280e7
--- /dev/null
+++ b/textproc/meilisearch/files/meilisearch.in
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# PROVIDE: meilisearch
+# REQUIRE: DAEMON NETWORKING
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable meilisearch:
+# meilisearch_enable (bool):    Set to "NO" by default.
+#                               Set it to "YES" to enable meilisearch.
+# meilisearch_user (user):      Set to "www" by default.
+#                               User to run meilisearch as.
+# meilisearch_group (group):    Set to "www" by default.
+#                               Group to run meilisearch as.
+# meilisearch_args (str):       Set to "" by default.
+#                               Extra flags passed to meilisearch.
+
+. /etc/rc.subr
+
+name=meilisearch
+rcvar=meilisearch_enable
+
+load_rc_config $name
+
+: ${meilisearch_enable:="NO"}
+: ${meilisearch_dir:="/var/db/meilisearch"}
+: ${meilisearch_config:="%%PREFIX%%/etc/meilisearch/meilisearch.toml"}
+: ${meilisearch_user:="www"}
+: ${meilisearch_group:="www"}
+: ${meilisearch_args:="--db-path ${meilisearch_dir} --dump-dir ${meilisearch_dir}/dumps"}
+: ${meilisearch_chdir:="${meilisearch_dir}"}
+
+pidfile="/var/run/${name}.pid"
+daemon_pidfile="/var/run/${name}-daemon.pid"
+procname="%%PREFIX%%/bin/meilisearch"
+command="/usr/sbin/daemon"
+command_args="-f -c -R 5 -r -T ${name} -p ${pidfile} -P ${daemon_pidfile} ${procname} ${meilisearch_args}"
+
+required_dirs="${meilisearch_dir}"
+required_files="${meilisearch_config}"
+
+start_precmd=meilisearch_startprecmd
+stop_postcmd=meilisearch_stoppostcmd
+
+meilisearch_startprecmd()
+{
+	if [ ! -e ${daemon_pidfile} ]; then
+		install -o ${meilisearch_user} -g ${meilisearch_group} /dev/null ${daemon_pidfile};
+	fi
+	if [ ! -e ${pidfile} ]; then
+		install -o ${meilisearch_user} -g ${meilisearch_group} /dev/null ${pidfile};
+	fi
+}
+
+
+meilisearch_stoppostcmd()
+{
+	if [ -f "${daemon_pidfile}" ]; then
+		pids=$( pgrep -F ${daemon_pidfile} 2>&1 )
+		_err=$?
+		[ ${_err} -eq 0 ] && kill -9 ${pids}
+	fi
+}
+
+run_rc_command "$1"
+