diff --git a/logmngr/Makefile b/logmngr/Makefile
index 3fb0916f0..dd5ba5959 100644
--- a/logmngr/Makefile
+++ b/logmngr/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=logmngr
-PKG_VERSION:=1.0.17
+PKG_VERSION:=1.0.18
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
diff --git a/logmngr/files/lib/logmngr/fluent-bit.sh b/logmngr/files/lib/logmngr/fluent-bit.sh
index 7ee0f81de..5fb914a2c 100644
--- a/logmngr/files/lib/logmngr/fluent-bit.sh
+++ b/logmngr/files/lib/logmngr/fluent-bit.sh
@@ -38,17 +38,20 @@ create_service_section() {
 	echo "" >> ${TMP_CONF_FILE}
 
 	# Generate default input for kmsg
-	echo "[INPUT]" >> ${TMP_CONF_FILE}
-	echo "    name       kmsg" >> ${TMP_CONF_FILE}
-	echo "    Tag        KMSG"  >> ${TMP_CONF_FILE}
-	echo "" >> ${TMP_CONF_FILE}
+	if [ -c "/dev/kmsg" ]; then
+		echo "[INPUT]" >> ${TMP_CONF_FILE}
+		echo "    name       kmsg" >> ${TMP_CONF_FILE}
+		echo "    Tag        KMSG"  >> ${TMP_CONF_FILE}
+		echo "" >> ${TMP_CONF_FILE}
+
+		echo "[OUTPUT]" >> ${TMP_CONF_FILE}
+		echo "    name         file" >> ${TMP_CONF_FILE}
+		echo "    match        KMSG" >> ${TMP_CONF_FILE}
+		echo "    file         /var/log/messages" >> ${TMP_CONF_FILE}
+		echo "    format       template" >> ${TMP_CONF_FILE}
+		echo "    template     {syslog_ts} {hostname} kernel: {msg}" >> ${TMP_CONF_FILE}
+	fi
 
-	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
-	echo "    name         file" >> ${TMP_CONF_FILE}
-	echo "    match        KMSG" >> ${TMP_CONF_FILE}
-	echo "    file         /var/log/messages" >> ${TMP_CONF_FILE}
-	echo "    format       template" >> ${TMP_CONF_FILE}
-	echo "    template     {syslog_ts} {hostname} kernel: {msg}" >> ${TMP_CONF_FILE}
 	echo "" >> ${TMP_CONF_FILE}
 }
 
@@ -58,11 +61,13 @@ create_input_section() {
 	# the input in our case is always syslog, hence, this section of the
 	# fluent-bit.conf file has hardcoded values as well that do not depend
 	# on any uci value
-	echo "[INPUT]" >> ${TMP_CONF_FILE}
-	echo "    name        syslog" >> ${TMP_CONF_FILE}
-	echo "    tag         $tag" >> ${TMP_CONF_FILE}
-	echo "    path        /dev/log" >> ${TMP_CONF_FILE}
-	echo "" >> ${TMP_CONF_FILE}
+	if [ -S "/dev/log" ]; then
+		echo "[INPUT]" >> ${TMP_CONF_FILE}
+		echo "    name        syslog" >> ${TMP_CONF_FILE}
+		echo "    tag         $tag" >> ${TMP_CONF_FILE}
+		echo "    path        /dev/log" >> ${TMP_CONF_FILE}
+		echo "" >> ${TMP_CONF_FILE}
+	fi
 }
 
 generate_facility_regex() {