diff --git a/aprsd/main.py b/aprsd/main.py
index b0e3b61..bd59198 100644
--- a/aprsd/main.py
+++ b/aprsd/main.py
@@ -89,11 +89,12 @@ args = parser.parse_args()
 def setup_connection():
     global tn
     host = CONFIG['aprs']['host']
-    LOG.debug("Setting up telnet connection to '%s'" % host)
+    port = CONFIG['aprs']['port']
+    LOG.debug("Setting up telnet connection to '%s:%s'" % (host, port))
     try:
-        tn = telnetlib.Telnet(host, 14580)
+        tn = telnetlib.Telnet(host, port)
     except Exception, e:
-        LOG.critical("Telnet session failed.\n", e)
+        LOG.exception("Telnet session failed.")
         sys.exit(-1)
 
 
@@ -430,6 +431,7 @@ def parse_config(args):
     check_option(config, 'aprs', 'login')
     check_option(config, 'aprs', 'password')
     check_option(config, 'aprs', 'host')
+    check_option(config, 'aprs', 'port')
     check_option(config, 'imap', 'host')
     check_option(config, 'imap', 'login')
     check_option(config, 'imap', 'password')
@@ -453,7 +455,7 @@ def main(args=args):
     user = CONFIG['aprs']['login']
     password = CONFIG['aprs']['password']
     LOG.info("LOGIN to APRSD with user '%s'" % user)
-    tn.write("user " + user + " pass " + password + " vers aprsd 0.99\n" )
+    tn.write("user %s pass %s vers aprsd 0.99\n" % (user, password) )
     time.sleep(2)
 
     check_email_thread()  # start email reader thread
diff --git a/aprsd/utils.py b/aprsd/utils.py
index dd3e17c..47cc069 100644
--- a/aprsd/utils.py
+++ b/aprsd/utils.py
@@ -14,6 +14,7 @@ aprs:
     login: someusername
     password: password
     host: noam.aprs2.net
+    port: 14580
 
 shortcuts:
     'aa': '5551239999@vtext.com'