diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php
index e80cc6614..e3e9e22cb 100644
--- a/src/Console/AutomaticInstallation.php
+++ b/src/Console/AutomaticInstallation.php
@@ -64,6 +64,7 @@ Options
     -s|--savedb               Save the DB credentials to the file (if environment variables is used)
     -H|--dbhost <host>        The host of the mysql/mariadb database (env MYSQL_HOST)
     -p|--dbport <port>        The port of the mysql/mariadb database (env MYSQL_PORT)
+    -s|--dbsocket <socket>    The socket of the mysql/mariadb database (env MYSQL_SOCKET)
     -d|--dbdata <database>    The name of the mysql/mariadb database (env MYSQL_DATABASE)
     -u|--dbuser <username>    The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
     -P|--dbpass <password>    The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
@@ -76,6 +77,7 @@ Options
 Environment variables
    MYSQL_HOST                  The host of the mysql/mariadb database (mandatory if mysql and environment is used)
    MYSQL_PORT                  The port of the mysql/mariadb database
+   MYSQL_SOCKET                The socket of the mysql/mariadb database
    MYSQL_USERNAME|MYSQL_USER   The username of the mysql/mariadb database login (MYSQL_USERNAME is for mysql, MYSQL_USER for mariadb)
    MYSQL_PASSWORD              The password of the mysql/mariadb database login
    MYSQL_DATABASE              The name of the mysql/mariadb database
@@ -157,6 +159,7 @@ HELP;
 
 			$db_host = $this->getOption(['H', 'dbhost'], ($save_db) ? (getenv('MYSQL_HOST')) : Installer::DEFAULT_HOST);
 			$db_port = $this->getOption(['p', 'dbport'], ($save_db) ? getenv('MYSQL_PORT') : null);
+			$db_socket = $this->getOption(['s', 'dbsocket'], ($save_db) ? getenv('MYSQL_SOCKET') : null);
 			$configCache->set('database', 'hostname', $db_host . (!empty($db_port) ? ':' . $db_port : ''));
 			$configCache->set('database', 'database',
 				$this->getOption(['d', 'dbdata'],
diff --git a/src/Database/Database.php b/src/Database/Database.php
index f478d7993..88d8d7d0f 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -114,6 +114,7 @@ class Database
 		$pass    = trim($this->configCache->get('database', 'password'));
 		$db      = trim($this->configCache->get('database', 'database'));
 		$charset = trim($this->configCache->get('database', 'charset'));
+		$socket  = trim($this->configCache->get('database', 'socket')); 
 
 		if (!(strlen($server) && strlen($user))) {
 			return false;
@@ -135,6 +136,10 @@ class Database
 				$connect .= ";charset=" . $charset;
 			}
 
+			if ($socket) {
+				$connect .= ";$unix_socket=" . $socket;
+			}
+
 			try {
 				$this->connection = @new PDO($connect, $user, $pass, [PDO::ATTR_PERSISTENT => $persistent]);
 				$this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, $this->pdo_emulate_prepares);
@@ -160,6 +165,11 @@ class Database
 				if ($charset) {
 					$this->connection->set_charset($charset);
 				}
+
+				if ($socket) {
+					$this->connection->set_socket($socket);
+				}
+
 			}
 		}
 
diff --git a/static/defaults.config.php b/static/defaults.config.php
index c31446cfe..97e4b0b54 100644
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -37,6 +37,11 @@ return [
 		// Can be used instead of adding a port number to the hostname
 		'port' => null,
 
+		// socket (String)
+                // Socket of the database server.
+                // Can be used instead of adding a socket location to the hostname
+                'socket' => '',
+
 		// user (String)
 		// Database user name. Please don't use "root".
 		'username' => '',
diff --git a/static/env.config.php b/static/env.config.php
index 59271cb65..a83b85b52 100644
--- a/static/env.config.php
+++ b/static/env.config.php
@@ -26,6 +26,7 @@ return [
 	'MYSQL_USERNAME' => ['database', 'username'],
 	'MYSQL_USER'     => ['database', 'username'],
 	'MYSQL_PORT'     => ['database', 'port'],
+	'MYSQL_SOCKET'   => ['database', 'socket'],
 	'MYSQL_PASSWORD' => ['database', 'password'],
 	'MYSQL_DATABASE' => ['database', 'database'],