diff --git a/net/mosquitto/files/mosquitto.uci.convert b/net/mosquitto/files/mosquitto.uci.convert
index 7932ef18f..1a03d9795 100644
--- a/net/mosquitto/files/mosquitto.uci.convert
+++ b/net/mosquitto/files/mosquitto.uci.convert
@@ -4,6 +4,8 @@
 # Karl Palsson <karlp@remake.is> 2012.
 # Considered to be released into the public domain
 
+[ -f $IPKG_INSTROOT/lib/functions.sh ] && . $IPKG_INSTROOT/lib/functions.sh
+
 TCONF=/tmp/mosquitto.generated.$$.conf
 while getopts "f:" o; do
     case $o in
@@ -23,66 +25,110 @@ NOW=$(date)
 echo "# mosquitto.conf file generated from UCI config." >>$TCONF
 echo "# Config snippet generated by $0 on $NOW" >>$TCONF
 echo "#" >> $TCONF
-QQ=$(uci -q get mosquitto.mosquitto.log_dest)
-if [ $? = 0 ]; then
-    for dest in $QQ; do
+
+# Usage: append_if cfg uci_name output_name
+# add a config line of the form "output_name <value>"
+# if the "uci_name" was found.
+# output_name defaults to uci_name if not specified.
+append_if() {
+    local cfg="$1"
+    local uci_name="$2"
+    local out_name="$3"
+    if [ -z "$out_name" ]; then
+        out_name=$uci_name
+    fi
+    config_get val $cfg $uci_name
+    if [ -n "$val" ]; then
+        echo "$out_name $val" >> $TCONF
+    fi
+}
+
+# mosquitto uses true/false, uci uses 1/0
+# note that this is not shell truthy, but equality with 1!
+append_bool() {
+    if [ $2 -eq 1 ]; then
+        echo "$1 true" >> $TCONF
+    else
+        echo "$1 false" >> $TCONF
+    fi
+}
+
+# as per append_if, but gets the value as a uci bool, not raw
+append_optional_bool() {
+    local cfg="$1"
+    local uci_name="$2"
+    local out_name="$3"
+    config_get val $cfg $uci_name
+    if [ -n "$val" ]; then
+        config_get_bool real $cfg $uci_name
+        append_bool $out_name $real
+    fi
+}
+
+mosq_general() {
+    config_get destinations "$1" log_dest
+    for dest in $destinations; do
         echo "log_dest $dest" >> $TCONF
     done
-fi
 
-QQ=$(uci -q get mosquitto.mosquitto.no_remote_access)
-if [ $? = 0 ]; then
-    if [ "$QQ" -eq 1 ]; then
+    config_get_bool no_remote "$1" no_remote_access 0
+    if [ "$no_remote" -eq 1 ]; then
         echo "bind_address 127.0.0.1" >> $TCONF
     fi
-fi
 
-HATE_SECTION_COUNT=$(grep config /etc/config/mosquitto | grep bridge | wc -l)
-if [ $HATE_SECTION_COUNT -gt 0 ]; then
-    for i in $(seq $HATE_SECTION_COUNT -1 1); do
-        NN=$(uci -q get mosquitto.@bridge[-$i].connection)
-        echo "" >> $TCONF
-        echo "# Bridge connection from UCI section" >> $TCONF
-        echo "connection $NN" >> $TCONF
-        ADDR=$(uci -q get mosquitto.@bridge[-$i].address)
-        echo "address $ADDR" >> $TCONF
-        TOPICS=$(uci -q -d';' get mosquitto.@bridge[-$i].topic)
-        # UGLY! just want to split on the ; :(
-        echo $TOPICS | sed "s/^/topic /" | sed "s/;/\ntopic /g" >> $TCONF
-        CS=$(uci -q get mosquitto.@bridge[-$i].cleansession)
-        if [ $? -eq 0 ]; then
-            if [ "$CS" -eq 1 ]; then
-                echo "cleansession true" >> $TCONF
-            fi
-        else
-            echo "cleansession false" >> $TCONF
-        fi
-        TRYPRIV=$(uci -q get mosquitto.@bridge[-$i].tryprivate)
-        if [ $? -eq 0 ]; then
-            if [ "$TRYPRIV" -eq 1 ]; then
-                echo "try_private true" >> $TCONF
-            else
-                echo "try_private false" >> $TCONF
-            fi
-        else
-            # Override default to avoid crashes with 0.15 brokers :(
-            echo "try_private false" >> $TCONF
-        fi
-        CLIENTID=$(uci -q get mosquitto.@bridge[-$i].clientid)
-        if [ $? -eq 0 ]; then
-            echo "clientid $CLIENTID" >> $TCONF
-        fi
-        BRIDGEID=$(uci -q get mosquitto.@bridge[-$i].identity)
-        if [ $? -eq 0 ]; then
-            echo "bridge_identity $BRIDGEID" >> $TCONF
-        fi
-        BRIDGEPSK=$(uci -q get mosquitto.@bridge[-$i].psk)
-        if [ $? -eq 0 ]; then
-            echo "bridge_psk $BRIDGEPSK" >> $TCONF
-        fi
-        BRIDGETLSVERSION=$(uci -q get mosquitto.@bridge[-$i].tls_version)
-        if [ $? -eq 0 ]; then
-            echo "bridge_tls_version $BRIDGETLSVERSION" >> $TCONF
-        fi
-    done
-fi
+    config_get port "$1" port 1883
+    echo "port $port" >> $TCONF
+    append_if "$1" protocol
+    append_if "$1" max_inflight_messages
+    append_if "$1" max_queued_messages
+
+}
+
+add_listener() {
+    echo "" >> $TCONF
+    config_get port "$1" port
+    if [ -z "$port" ]; then
+        echo "Ignoring listener section without port"
+        return
+    fi
+    config_get_bool no_remote "$1" no_remote_access 0
+    if [ "$no_remote" -eq 1 ]; then
+        echo "listener $port 127.0.0.1" >> $TCONF
+    else
+        echo "listener $port" >> $TCONF
+    fi
+
+    append_if "$1" protocol
+}
+
+add_topic() {
+    echo "topic $1" >> $TCONF
+}
+
+add_bridge() {
+    config_get conn "$1" connection
+    config_get addr "$1" address
+    if [ -z "$conn" -o -z "$addr" ]; then
+        echo "Ignoring bridge section, misisng connection/address"
+        return
+    fi
+    echo "" >> $TCONF
+    echo "# Bridge connection from UCI section" >> $TCONF
+    append_if "$1" connection
+    append_if "$1" address
+
+    config_list_foreach "$1" topic add_topic
+    append_optional_bool "$1" cleansession cleansession
+    append_optional_bool "$1" try_private try_private
+
+    append_if "$1" clientid
+    append_if "$1" identity bridge_identity
+    append_if "$1" psk bridge_psk
+    append_if "$1" tls_version bridge_tls_version
+}
+
+
+config_load "mosquitto"
+config_foreach mosq_general "mosquitto"
+config_foreach add_listener "listener"
+config_foreach add_bridge "bridge"