diff --git a/README.md b/README.md
index 48e5e83..3ae41de 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ TODO:
 - gps3
 - schedule
 - aprslib
+- paho.mqtt
 
 ## License
 
diff --git a/aprs_telemetry_to_mqtt.py b/aprs_telemetry_to_mqtt.py
index 863c91c..d263885 100755
--- a/aprs_telemetry_to_mqtt.py
+++ b/aprs_telemetry_to_mqtt.py
@@ -91,7 +91,8 @@ class aprs_telemetry_to_mqtt:
     # Publish a single message to the MQTT broker
     def publish(self, topic, message):
         try:
-            publish.single(topic, message, hostname=self.config_file_settings['global']['broker'])
+            #publish.single(topic, message, hostname=self.config_file_settings['global']['broker'])
+            publish.single(topic, message, hostname=self.config_file_settings['global']['broker'], port=self.config_file_settings['global']['port'], client_id=self.mqtt_client_id)
         except:
             logger.debug("Failed to connect to MQTT  broker.")
         else:
@@ -176,7 +177,8 @@ class aprs_telemetry_to_mqtt:
                                 publish_list.append({"topic": current_topic, "payload": values[index]})
 
                             try:
-                                publish.multiple(publish_list, hostname=self.config_file_settings['global']['broker'])
+                                #publish.multiple(publish_list, hostname=self.config_file_settings['global']['broker'])
+                                publish.multiple(publish_list, hostname=self.config_file_settings['global']['broker'], port=self.config_file_settings['global']['port'], client_id=self.mqtt_client_id)
                             except:
                                 logger.debug("Failed to connect to MQTT  broker.")
                             else:
diff --git a/pe1rxf_aprs.py b/pe1rxf_aprs.py
index 085e1bf..25e6289 100644
--- a/pe1rxf_aprs.py
+++ b/pe1rxf_aprs.py
@@ -487,8 +487,8 @@ def run():
     schedule.every(1).minutes.do(read_weather_station, weather_station)
 
     # Schedule telemetry transmision
-    print("Scheduled telemetry transmission.")
-    schedule.every(10).minutes.do(send_telemetry)
+    #print("Scheduled telemetry transmission.")
+    #schedule.every(10).minutes.do(send_telemetry)
 
     print("Schedule mqtt weather publisher.")
     interval = mqtt_connection.config_file_settings['global']['weather_report_interval']