diff --git a/AUTHORS.md b/AUTHORS.md
index 4ae4b749a..bc4f417c9 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -33,6 +33,7 @@ Contributors to LibreNMS:
 - James Campbell <neokjames@gmail.com> (neokjames)
 - Steve Calvário <calvario.steve@gmail.com> (Calvario)
 - Christian Marg <marg@rz.tu-clausthal.de> (einhirn)
+- Louis Rossouw <lrossouw@gmail.com> (spinza)
 
 [1]: http://observium.org/ "Observium web site"
 
diff --git a/poller-wrapper.py b/poller-wrapper.py
index 448a09328..be52f1bb7 100755
--- a/poller-wrapper.py
+++ b/poller-wrapper.py
@@ -81,9 +81,20 @@ except:
 poller_path = config['install_dir'] + '/poller.php'
 db_username = config['db_user']
 db_password = config['db_pass']
-db_server = config['db_host']
+
+if config['db_host'][:5].lower() == 'unix:':
+	db_server = config['db_host']
+	db_port = 0
+elif ':' in config['db_host']:
+	db_server = config['db_host'].rsplit(':')[0]
+	db_port = int(config['db_host'].rsplit(':')[1])
+else:
+	db_server = config['db_host']
+	db_port =0
+
 db_dbname = config['db_name']
 
+
 # (c) 2015, GPLv3, Daniel Preussker <f0o@devilcode.org> <<<EOC1
 if 'distributed_poller_group' in config:
     poller_group = str(config['distributed_poller_group'])
@@ -167,7 +178,10 @@ except:
 devices_list = []
 
 try:
-    db = MySQLdb.connect(host=db_server, user=db_username, passwd=db_password, db=db_dbname)
+    if db_port == 0:
+        db = MySQLdb.connect(host=db_server, user=db_username, passwd=db_password, db=db_dbname)
+    else:
+        db = MySQLdb.connect(host=db_server, port=db_port, user=db_username, passwd=db_password, db=db_dbname)
     cursor = db.cursor()
 except:
     print "ERROR: Could not connect to MySQL database!"