diff --git a/changelog.md b/changelog.md
index 7667ab59..6fe3f77b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@ Bug Fixes:
 ----------
 
 * Don't install tests.
+* Do not ignore the socket passed with the -S option, even when no port is passed
 * Fix unexpected exception when using dsn without username & password (Thanks: [Will Wang])
 * Let the `--prompt` option act normally with its predefined default value
 
diff --git a/mycli/AUTHORS b/mycli/AUTHORS
index d71c5537..e9c73aa6 100644
--- a/mycli/AUTHORS
+++ b/mycli/AUTHORS
@@ -31,6 +31,7 @@ Contributors:
   * Daniel Black
   * Daniel West
   * Daniël van Eeden
+  * Fabrizio Gennari
   * François Pietka
   * Frederic Aoustin
   * Georgy Frolov
diff --git a/mycli/main.py b/mycli/main.py
index 726ae2aa..47cfec58 100755
--- a/mycli/main.py
+++ b/mycli/main.py
@@ -428,6 +428,7 @@ def connect(self, database='', user='', passwd='', host='', port='',
             port = 3306
             if not host or host == 'localhost':
                 socket = (
+                    socket or
                     cnf['socket'] or
                     cnf['default_socket'] or
                     guess_socket_location()