diff --git a/packages/libmosquitto/build.sh b/packages/libmosquitto/build.sh
index fe3855c463..72e3750a30 100644
--- a/packages/libmosquitto/build.sh
+++ b/packages/libmosquitto/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="MQTT library"
 TERMUX_PKG_LICENSE="EPL-1.0"
 TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf"
 TERMUX_PKG_VERSION=1.6.10
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://mosquitto.org/files/source/mosquitto-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=92d1807717f0f6d57d1ac1207ffdb952e8377e916c7b0bb4718f745239774232
 TERMUX_PKG_DEPENDS="c-ares, libc++, libwebsockets, openssl"
@@ -14,3 +14,4 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWITH_THREADING=OFF
 -DWITH_TLS_PSK=OFF
 -DWITH_WEBSOCKETS=ON"
+TERMUX_PKG_SERVICE_SCRIPT=("mosquitto" 'exec mosquitto 2>&1')
diff --git a/packages/libmosquitto/mosquitto.subpackage.sh b/packages/libmosquitto/mosquitto.subpackage.sh
index e1e9907865..d0e5158e74 100644
--- a/packages/libmosquitto/mosquitto.subpackage.sh
+++ b/packages/libmosquitto/mosquitto.subpackage.sh
@@ -1,3 +1,10 @@
 TERMUX_SUBPKG_DEPENDS="libuuid"
-TERMUX_SUBPKG_INCLUDE="bin/ share/man/ etc/"
+TERMUX_SUBPKG_INCLUDE="
+bin/
+share/man/
+etc/
+var/service/mosquitto/run
+var/service/mosquitto/down
+var/service/mosquitto/log/run
+"
 TERMUX_SUBPKG_DESCRIPTION="MQTT version 3.1/3.1.1 compatible message broker and clients"