diff --git a/core/setup/controller.php b/core/setup/controller.php
index 58ed4d28dc0a33b3e091a9b8b417ae897112e95b..697408cfb576ee603f1a162a8cb24277e307e9ab 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -91,7 +91,7 @@ class Controller {
 			$databases['sqlite'] = 'SQLite';
 		}
 		if ($hasMySQL) {
-			$databases['mysql'] = 'MySQL';
+			$databases['mysql'] = 'MySQL/MariaDB';
 		}
 		if ($hasPostgreSQL) {
 			$databases['pgsql'] = 'PostgreSQL';
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index d97b6d2602fac048aa187ed9407d379b6786c612..b2c28173b1c61a57fb964ada4d28d7f15d5b77e7 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -3,13 +3,13 @@
 namespace OC\Setup;
 
 class MySQL extends AbstractDatabase {
-	public $dbprettyname = 'MySQL';
+	public $dbprettyname = 'MySQL/MariaDB';
 
 	public function setupDatabase($username) {
 		//check if the database user has admin right
 		$connection = @mysql_connect($this->dbhost, $this->dbuser, $this->dbpassword);
 		if(!$connection) {
-			throw new \DatabaseSetupException($this->trans->t('MySQL username and/or password not valid'),
+			throw new \DatabaseSetupException($this->trans->t('MySQL/MariaDB username and/or password not valid'),
 				$this->trans->t('You need to enter either an existing account or the administrator.'));
 		}
 		$oldUser=\OC_Config::getValue('dbuser', false);
@@ -82,14 +82,14 @@ class MySQL extends AbstractDatabase {
 		$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
 		$result = mysql_query($query, $connection);
 		if (!$result) {
-			throw new \DatabaseSetupException($this->trans->t("MySQL user '%s'@'localhost' exists already.", array($name)),
-				$this->trans->t("Drop this user from MySQL", array($name)));
+			throw new \DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'localhost' exists already.", array($name)),
+				$this->trans->t("Drop this user from MySQL/MariaDB", array($name)));
 		}
 		$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
 		$result = mysql_query($query, $connection);
 		if (!$result) {
-			throw new \DatabaseSetupException($this->trans->t("MySQL user '%s'@'%%' already exists", array($name)),
-				$this->trans->t("Drop this user from MySQL."));
+			throw new \DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'%%' already exists", array($name)),
+				$this->trans->t("Drop this user from MySQL/MariaDB."));
 		}
 	}
 }