diff --git a/lib/setup.php b/lib/setup.php
index 741a1837cc..d8f4cbfbcb 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -19,6 +19,14 @@ class DatabaseSetupException extends Exception
 }
 
 class OC_Setup {
+	static $dbSetupClasses = array(
+		'mysql' => '\OC\Setup\MySQL',
+		'pgsql' => '\OC\Setup\PostgreSQL',
+		'oci'   => '\OC\Setup\OCI',
+		'mssql' => '\OC\Setup\MSSQL',
+		'sqlite' => '\OC\Setup\Sqlite',
+		'sqlite3' => '\OC\Setup\Sqlite',
+	);
 
 	public static function getTrans(){
 		return OC_L10N::get('lib');
@@ -40,770 +48,90 @@ class OC_Setup {
 			$options['directory'] = OC::$SERVERROOT."/data";
 		}
 
-		if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { //mysql and postgresql needs more config options
-			if($dbtype == 'mysql')
-				$dbprettyname = 'MySQL';
-			else if($dbtype == 'pgsql')
-				$dbprettyname = 'PostgreSQL';
-			else if ($dbtype == 'mssql')
-				$dbprettyname = 'MS SQL Server';
-			else
-				$dbprettyname = 'Oracle';
-
-
-			if(empty($options['dbuser'])) {
-				$error[] = $l->t("%s enter the database username.", array($dbprettyname));
-			}
-			if(empty($options['dbname'])) {
-				$error[] = $l->t("%s enter the database name.", array($dbprettyname));
-			}
-			if(substr_count($options['dbname'], '.') >= 1) {
-				$error[] = $l->t("%s you may not use dots in the database name", array($dbprettyname));
-			}
-			if($dbtype != 'oci' && empty($options['dbhost'])) {
-				$options['dbhost'] = 'localhost';
-			}
+		if (!isset(self::$dbSetupClasses[$dbtype])) {
+			$dbtype = 'sqlite';
 		}
 
-		if(count($error) == 0) { //no errors, good
-			$username = htmlspecialchars_decode($options['adminlogin']);
-			$password = htmlspecialchars_decode($options['adminpass']);
-			$datadir = htmlspecialchars_decode($options['directory']);
+		$class = self::$dbSetupClasses[$dbtype];
+		$dbSetup = new $class(self::getTrans(), 'db_structure.xml');
+		$error = array_merge($error, $dbSetup->validate($options));
 
-			if (OC_Util::runningOnWindows()) {
-				$datadir = rtrim(realpath($datadir), '\\');
+		if(count($error) != 0) {
+			return $error;
+		}
+
+		//no errors, good
+		$username = htmlspecialchars_decode($options['adminlogin']);
+		$password = htmlspecialchars_decode($options['adminpass']);
+		$datadir = htmlspecialchars_decode($options['directory']);
+
+		if (OC_Util::runningOnWindows()) {
+			$datadir = rtrim(realpath($datadir), '\\');
+		}
+
+		//use sqlite3 when available, otherise sqlite2 will be used.
+		if($dbtype=='sqlite' and class_exists('SQLite3')) {
+			$dbtype='sqlite3';
+		}
+
+		//generate a random salt that is used to salt the local user passwords
+		$salt = OC_Util::generate_random_bytes(30);
+		OC_Config::setValue('passwordsalt', $salt);
+
+		//write the config file
+		OC_Config::setValue('datadirectory', $datadir);
+		OC_Config::setValue('dbtype', $dbtype);
+		OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
+		try {
+			$dbSetup->initialize($options);
+			$dbSetup->setupDatabase($username);
+		} catch (DatabaseSetupException $e) {
+			$error[] = array(
+				'error' => $e->getMessage(),
+				'hint' => $e->getHint()
+			);
+			return($error);
+		} catch (Exception $e) {
+			$error[] = array(
+				'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
+				'hint' => ''
+			);
+			return($error);
+		}
+
+		//create the user and group
+		try {
+			OC_User::createUser($username, $password);
+		}
+		catch(Exception $exception) {
+			$error[] = $exception->getMessage();
+		}
+
+		if(count($error) == 0) {
+			OC_Appconfig::setValue('core', 'installedat', microtime(true));
+			OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
+			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+			OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
+
+			OC_Group::createGroup('admin');
+			OC_Group::addToGroup($username, 'admin');
+			OC_User::login($username, $password);
+
+			//guess what this does
+			OC_Installer::installShippedApps();
+
+			//create htaccess files for apache hosts
+			if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
+				self::createHtaccess();
 			}
 
-			//use sqlite3 when available, otherise sqlite2 will be used.
-			if($dbtype=='sqlite' and class_exists('SQLite3')) {
-				$dbtype='sqlite3';
-			}
-
-			//generate a random salt that is used to salt the local user passwords
-			$salt = OC_Util::generate_random_bytes(30);
-			OC_Config::setValue('passwordsalt', $salt);
-
-			//write the config file
-			OC_Config::setValue('datadirectory', $datadir);
-			OC_Config::setValue('dbtype', $dbtype);
-			OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
-			if($dbtype == 'mysql') {
-				$dbuser = $options['dbuser'];
-				$dbpass = $options['dbpass'];
-				$dbname = $options['dbname'];
-				$dbhost = $options['dbhost'];
-				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
-
-				OC_Config::setValue('dbname', $dbname);
-				OC_Config::setValue('dbhost', $dbhost);
-				OC_Config::setValue('dbtableprefix', $dbtableprefix);
-
-				try {
-					self::setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username);
-				} catch (DatabaseSetupException $e) {
-					$error[] = array(
-						'error' => $e->getMessage(),
-						'hint' => $e->getHint()
-					);
-					return($error);
-				}
-			}
-			elseif($dbtype == 'pgsql') {
-				$dbuser = $options['dbuser'];
-				$dbpass = $options['dbpass'];
-				$dbname = $options['dbname'];
-				$dbhost = $options['dbhost'];
-				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
-
-				OC_Config::setValue('dbname', $dbname);
-				OC_Config::setValue('dbhost', $dbhost);
-				OC_Config::setValue('dbtableprefix', $dbtableprefix);
-
-				try {
-					self::setupPostgreSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username);
-				} catch (DatabaseSetupException $e) {
-					$error[] = array(
-						'error' => $l->t('PostgreSQL username and/or password not valid'),
-						'hint' => $l->t('You need to enter either an existing account or the administrator.')
-					);
-					return $error;
-				}
-			}
-			elseif($dbtype == 'oci') {
-				$dbuser = $options['dbuser'];
-				$dbpass = $options['dbpass'];
-				$dbname = $options['dbname'];
-				if (array_key_exists('dbtablespace', $options)) {
-					$dbtablespace = $options['dbtablespace'];
-				} else {
-					$dbtablespace = 'USERS';
-				}
-				$dbhost = isset($options['dbhost'])?$options['dbhost']:'';
-				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
-
-				OC_Config::setValue('dbname', $dbname);
-				OC_Config::setValue('dbhost', $dbhost);
-				OC_Config::setValue('dbtableprefix', $dbtableprefix);
-
-				try {
-					self::setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace, $username);
-				} catch (DatabaseSetupException $e) {
-					$error[] = array(
-						'error' => $l->t('Oracle connection could not be established'),
-						'hint' => $e->getMessage().' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
-							.' ORACLE_SID='.getenv('ORACLE_SID')
-							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
-							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable'
-					);
-					return $error;
-				}
-			}
-			elseif ($dbtype == 'mssql') {
-				$dbuser = $options['dbuser'];
-				$dbpass = $options['dbpass'];
-				$dbname = $options['dbname'];
-				$dbhost = $options['dbhost'];
-				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
-
-				OC_Config::setValue('dbname', $dbname);
-				OC_Config::setValue('dbhost', $dbhost);
-				OC_Config::setValue('dbuser', $dbuser);
-				OC_Config::setValue('dbpassword', $dbpass);
-				OC_Config::setValue('dbtableprefix', $dbtableprefix);
-
-				try {
-					self::setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix);
-				} catch (DatabaseSetupException $e) {
-					$error[] = array(
-						'error' => 'MS SQL username and/or password not valid',
-						'hint' => 'You need to enter either an existing account or the administrator.'
-					);
-					return $error;
-				}
-			}
-			else {
-				//delete the old sqlite database first, might cause infinte loops otherwise
-				if(file_exists("$datadir/owncloud.db")) {
-					unlink("$datadir/owncloud.db");
-				}
-				//in case of sqlite, we can always fill the database
-				error_log("creating sqlite db");
-				OC_DB::createDbFromStructure('db_structure.xml');
-			}
-
-			//create the user and group
-			try {
-				OC_User::createUser($username, $password);
-			}
-			catch(Exception $exception) {
-				$error[] = 'Error while trying to create admin user: ' . $exception->getMessage();
-			}
-
-			if(count($error) == 0) {
-				OC_Appconfig::setValue('core', 'installedat', microtime(true));
-				OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
-				OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
-				OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-
-				OC_Group::createGroup('admin');
-				OC_Group::addToGroup($username, 'admin');
-				OC_User::login($username, $password);
-
-				//guess what this does
-				OC_Installer::installShippedApps();
-
-				//create htaccess files for apache hosts
-				if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
-					self::createHtaccess();
-				}
-
-				//and we are done
-				OC_Config::setValue('installed', true);
-			}
+			//and we are done
+			OC_Config::setValue('installed', true);
 		}
 
 		return $error;
 	}
 
-	private static function setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) {
-		//check if the database user has admin right
-		$l = self::getTrans();
-		$connection = @mysql_connect($dbhost, $dbuser, $dbpass);
-		if(!$connection) {
-			throw new DatabaseSetupException($l->t('MySQL username and/or password not valid'),
-				$l->t('You need to enter either an existing account or the administrator.'));
-		}
-		$oldUser=OC_Config::getValue('dbuser', false);
-
-		//this should be enough to check for admin rights in mysql
-		$query="SELECT user FROM mysql.user WHERE user='$dbuser'";
-		if(mysql_query($query, $connection)) {
-			//use the admin login data for the new database user
-
-			//add prefix to the mysql user name to prevent collisions
-			$dbusername=substr('oc_'.$username, 0, 16);
-			if($dbusername!=$oldUser) {
-				//hash the password so we don't need to store the admin config in the config file
-				$dbpassword=OC_Util::generate_random_bytes(30);
-
-				self::createDBUser($dbusername, $dbpassword, $connection);
-
-				OC_Config::setValue('dbuser', $dbusername);
-				OC_Config::setValue('dbpassword', $dbpassword);
-			}
-
-			//create the database
-			self::createMySQLDatabase($dbname, $dbusername, $connection);
-		}
-		else {
-			if($dbuser!=$oldUser) {
-				OC_Config::setValue('dbuser', $dbuser);
-				OC_Config::setValue('dbpassword', $dbpass);
-			}
-
-			//create the database
-			self::createMySQLDatabase($dbname, $dbuser, $connection);
-		}
-
-		//fill the database if needed
-		$query='select count(*) from information_schema.tables'
-			." where table_schema='$dbname' AND table_name = '{$dbtableprefix}users';";
-		$result = mysql_query($query, $connection);
-		if($result) {
-			$row=mysql_fetch_row($result);
-		}
-		if(!$result or $row[0]==0) {
-			OC_DB::createDbFromStructure('db_structure.xml');
-		}
-		mysql_close($connection);
-	}
-
-	private static function createMySQLDatabase($name, $user, $connection) {
-		//we cant use OC_BD functions here because we need to connect as the administrative user.
-		$l = self::getTrans();
-		$query = "CREATE DATABASE IF NOT EXISTS  `$name`";
-		$result = mysql_query($query, $connection);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(mysql_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-		}
-		$query="GRANT ALL PRIVILEGES ON  `$name` . * TO  '$user'";
-
-		//this query will fail if there aren't the right permissions, ignore the error
-		mysql_query($query, $connection);
-	}
-
-	private static function createDBUser($name, $password, $connection) {
-		// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
-		// the anonymous user would take precedence when there is one.
-		$l = self::getTrans();
-		$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
-		$result = mysql_query($query, $connection);
-		if (!$result) {
-			throw new DatabaseSetupException($l->t("MySQL user '%s'@'localhost' exists already.",
-				array($name)), $l->t("Drop this user from MySQL", array($name)));
-		}
-		$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
-		$result = mysql_query($query, $connection);
-		if (!$result) {
-			throw new DatabaseSetupException($l->t("MySQL user '%s'@'%%' already exists", array($name)),
-				$l->t("Drop this user from MySQL."));
-		}
-	}
-
-	private static function setupPostgreSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) {
-		$e_host = addslashes($dbhost);
-		$e_user = addslashes($dbuser);
-		$e_password = addslashes($dbpass);
-		$l = self::getTrans();
-
-		//check if the database user has admin rights
-		$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'";
-		$connection = @pg_connect($connection_string);
-		if(!$connection) {
-			// Try if we can connect to the DB with the specified name
-			$e_dbname = addslashes($dbname);
-			$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
-			$connection = @pg_connect($connection_string);
-
-			if(!$connection)
-				throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'));
-		}
-		$e_user = pg_escape_string($dbuser);
-		//check for roles creation rights in postgresql
-		$query="SELECT 1 FROM pg_roles WHERE rolcreaterole=TRUE AND rolname='$e_user'";
-		$result = pg_query($connection, $query);
-		if($result and pg_num_rows($result) > 0) {
-			//use the admin login data for the new database user
-
-			//add prefix to the postgresql user name to prevent collisions
-			$dbusername='oc_'.$username;
-			//create a new password so we don't need to store the admin config in the config file
-			$dbpassword=OC_Util::generate_random_bytes(30);
-
-			self::pg_createDBUser($dbusername, $dbpassword, $connection);
-
-			OC_Config::setValue('dbuser', $dbusername);
-			OC_Config::setValue('dbpassword', $dbpassword);
-
-			//create the database
-			self::pg_createDatabase($dbname, $dbusername, $connection);
-		}
-		else {
-			OC_Config::setValue('dbuser', $dbuser);
-			OC_Config::setValue('dbpassword', $dbpass);
-
-			//create the database
-			self::pg_createDatabase($dbname, $dbuser, $connection);
-		}
-
-		// the connection to dbname=postgres is not needed anymore
-		pg_close($connection);
-
-		// connect to the ownCloud database (dbname=$dbname) and check if it needs to be filled
-		$dbuser = OC_Config::getValue('dbuser');
-		$dbpass = OC_Config::getValue('dbpassword');
-
-		$e_host = addslashes($dbhost);
-		$e_dbname = addslashes($dbname);
-		$e_user = addslashes($dbuser);
-		$e_password = addslashes($dbpass);
-
-		$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
-		$connection = @pg_connect($connection_string);
-		if(!$connection) {
-			throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'));
-		}
-		$query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
-		$result = pg_query($connection, $query);
-		if($result) {
-			$row = pg_fetch_row($result);
-		}
-		if(!$result or $row[0]==0) {
-			OC_DB::createDbFromStructure('db_structure.xml');
-		}
-	}
-
-	private static function pg_createDatabase($name, $user, $connection) {
-
-		//we cant use OC_BD functions here because we need to connect as the administrative user.
-		$l = self::getTrans();
-		$e_name = pg_escape_string($name);
-		$e_user = pg_escape_string($user);
-		$query = "select datname from pg_database where datname = '$e_name'";
-		$result = pg_query($connection, $query);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-		}
-		if(! pg_fetch_row($result)) {
-			//The database does not exists... let's create it
-			$query = "CREATE DATABASE \"$e_name\" OWNER \"$e_user\"";
-			$result = pg_query($connection, $query);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-			}
-			else {
-				$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
-				pg_query($connection, $query);
-			}
-		}
-	}
-
-	private static function pg_createDBUser($name, $password, $connection) {
-		$l = self::getTrans();
-		$e_name = pg_escape_string($name);
-		$e_password = pg_escape_string($password);
-		$query = "select * from pg_roles where rolname='$e_name';";
-		$result = pg_query($connection, $query);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-		}
-
-		if(! pg_fetch_row($result)) {
-			//user does not exists let's create it :)
-			$query = "CREATE USER \"$e_name\" CREATEDB PASSWORD '$e_password';";
-			$result = pg_query($connection, $query);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-			}
-		}
-		else { // change password of the existing role
-			$query = "ALTER ROLE \"$e_name\" WITH PASSWORD '$e_password';";
-			$result = pg_query($connection, $query);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
-			}
-		}
-	}
-
-	private static function setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace,
-			$username) {
-		$l = self::getTrans();
-		$e_host = addslashes($dbhost);
-		$e_dbname = addslashes($dbname);
-		//check if the database user has admin right
-		if ($e_host == '') {
-			$easy_connect_string = $e_dbname; // use dbname as easy connect name
-		} else {
-			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
-		}
-		\OC_Log::write('setup oracle', 'connect string: ' . $easy_connect_string, \OC_Log::DEBUG);
-		$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
-		if(!$connection) {
-			$e = oci_error();
-			if (is_array ($e) && isset ($e['message'])) {
-				throw new DatabaseSetupException($e['message']);
-			}
-			throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'));
-		}
-		//check for roles creation rights in oracle
-
-		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
-			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $l->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-		$result = oci_execute($stmt);
-		if($result) {
-			$row = oci_fetch_row($stmt);
-		}
-		if($result and $row[0] > 0) {
-			//use the admin login data for the new database user
-
-			//add prefix to the oracle user name to prevent collisions
-			$dbusername='oc_'.$username;
-			//create a new password so we don't need to store the admin config in the config file
-			$dbpassword=OC_Util::generate_random_bytes(30);
-
-			//oracle passwords are treated as identifiers:
-			//  must start with aphanumeric char
-			//  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
-			$dbpassword=substr($dbpassword, 0, 30);
-
-			self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection);
-
-			OC_Config::setValue('dbuser', $dbusername);
-			OC_Config::setValue('dbname', $dbusername);
-			OC_Config::setValue('dbpassword', $dbpassword);
-
-			//create the database not neccessary, oracle implies user = schema
-			//self::oci_createDatabase($dbname, $dbusername, $connection);
-		} else {
-
-			OC_Config::setValue('dbuser', $dbuser);
-			OC_Config::setValue('dbname', $dbname);
-			OC_Config::setValue('dbpassword', $dbpass);
-
-			//create the database not neccessary, oracle implies user = schema
-			//self::oci_createDatabase($dbname, $dbuser, $connection);
-		}
-
-		//FIXME check tablespace exists: select * from user_tablespaces
-
-		// the connection to dbname=oracle is not needed anymore
-		oci_close($connection);
-
-		// connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled
-		$dbuser = OC_Config::getValue('dbuser');
-		//$dbname = OC_Config::getValue('dbname');
-		$dbpass = OC_Config::getValue('dbpassword');
-
-		$e_host = addslashes($dbhost);
-		$e_dbname = addslashes($dbname);
-
-		if ($e_host == '') {
-			$easy_connect_string = $e_dbname; // use dbname as easy connect name
-		} else {
-			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
-		}
-		$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
-		if(!$connection) {
-			throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'));
-		}
-		$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
-		$stmt = oci_parse($connection, $query);
-		$un = $dbtableprefix.'users';
-		oci_bind_by_name($stmt, ':un', $un);
-		if (!$stmt) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-		$result = oci_execute($stmt);
-
-		if($result) {
-			$row = oci_fetch_row($stmt);
-		}
-		if(!$result or $row[0]==0) {
-			OC_DB::createDbFromStructure('db_structure.xml');
-		}
-	}
-
-	/**
-	 *
-	 * @param String $name
-	 * @param String $password
-	 * @param String $tablespace
-	 * @param resource $connection
-	 */
-	private static function oci_createDBUser($name, $password, $tablespace, $connection) {
-		$l = self::getTrans();
-		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-		oci_bind_by_name($stmt, ':un', $name);
-		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-
-		if(! oci_fetch_row($stmt)) {
-			//user does not exists let's create it :)
-			//password must start with alphabetic character in oracle
-			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace
-			$stmt = oci_parse($connection, $query);
-			if (!$stmt) {
-				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-			}
-			//oci_bind_by_name($stmt, ':un', $name);
-			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
-					array($query, $name, $password)) . '<br />';
-				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-			}
-		} else { // change password of the existing role
-			$query = "ALTER USER :un IDENTIFIED BY :pw";
-			$stmt = oci_parse($connection, $query);
-			if (!$stmt) {
-				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-			}
-			oci_bind_by_name($stmt, ':un', $name);
-			oci_bind_by_name($stmt, ':pw', $password);
-			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-				$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-			}
-		}
-		// grant necessary roles
-		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
-			$entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
-				array($query, $name, $password)) . '<br />';
-			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
-		}
-	}
-
-	private static function setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix) {
-		$l = self::getTrans();
-
-		//check if the database user has admin right
-		$masterConnectionInfo = array( "Database" => "master", "UID" => $dbuser, "PWD" => $dbpass);
-
-		$masterConnection = @sqlsrv_connect($dbhost, $masterConnectionInfo);
-		if(!$masterConnection) {
-			$entry = null;
-			if( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			throw new DatabaseSetupException($l->t('MS SQL username and/or password not valid: %s', array($entry)));
-		}
-
-		OC_Config::setValue('dbuser', $dbuser);
-		OC_Config::setValue('dbpassword', $dbpass);
-
-		self::mssql_createDBLogin($dbuser, $dbpass, $masterConnection);
-
-		self::mssql_createDatabase($dbname, $masterConnection);
-
-		self::mssql_createDBUser($dbuser, $dbname, $masterConnection);
-
-		sqlsrv_close($masterConnection);
-
-		self::mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix);
-	}
-
-	private static function mssql_createDBLogin($name, $password, $connection) {
-		$query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';";
-		$result = sqlsrv_query($connection, $query);
-		if ($result === false) {
-			if ( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			$entry.='Offending command was: '.$query.'<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-		} else {
-			$row = sqlsrv_fetch_array($result);
-
-			if ($row === false) {
-				if ( ($errors = sqlsrv_errors() ) != null) {
-					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-				} else {
-					$entry = '';
-				}
-				$entry.='Offending command was: '.$query.'<br />';
-				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-			} else {
-				if ($row == null) {
-					$query = "CREATE LOGIN [".$name."] WITH PASSWORD = '".$password."';";
-					$result = sqlsrv_query($connection, $query);
-					if (!$result or $result === false) {
-						if ( ($errors = sqlsrv_errors() ) != null) {
-							$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-						} else {
-							$entry = '';
-						}
-						$entry.='Offending command was: '.$query.'<br />';
-						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-					}
-				}
-			}
-		}
-	}
-
-	private static function mssql_createDBUser($name, $dbname, $connection) {
-		$query = "SELECT * FROM [".$dbname."].sys.database_principals WHERE name = '".$name."';";
-		$result = sqlsrv_query($connection, $query);
-		if ($result === false) {
-			if ( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			$entry.='Offending command was: '.$query.'<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-		} else {
-			$row = sqlsrv_fetch_array($result);
-
-			if ($row === false) {
-				if ( ($errors = sqlsrv_errors() ) != null) {
-					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-				} else {
-					$entry = '';
-				}
-				$entry.='Offending command was: '.$query.'<br />';
-				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-			} else {
-				if ($row == null) {
-					$query = "USE [".$dbname."]; CREATE USER [".$name."] FOR LOGIN [".$name."];";
-					$result = sqlsrv_query($connection, $query);
-					if (!$result || $result === false) {
-						if ( ($errors = sqlsrv_errors() ) != null) {
-							$entry = 'DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-						} else {
-							$entry = '';
-						}
-						$entry.='Offending command was: '.$query.'<br />';
-						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-					}
-				}
-
-				$query = "USE [".$dbname."]; EXEC sp_addrolemember 'db_owner', '".$name."';";
-				$result = sqlsrv_query($connection, $query);
-				if (!$result || $result === false) {
-					if ( ($errors = sqlsrv_errors() ) != null) {
-						$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-					} else {
-						$entry = '';
-					}
-					$entry.='Offending command was: '.$query.'<br />';
-					\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-				}
-			}
-		}
-	}
-
-	private static function mssql_createDatabase($dbname, $connection) {
-		$query = "CREATE DATABASE [".$dbname."];";
-		$result = sqlsrv_query($connection, $query);
-		if (!$result || $result === false) {
-			if ( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			$entry.='Offending command was: '.$query.'<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-		}
-	}
-
-	private static function mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix) {
-		$connectionInfo = array( "Database" => $dbname, "UID" => $dbuser, "PWD" => $dbpass);
-
-		$connection = @sqlsrv_connect($dbhost, $connectionInfo);
-
-		//fill the database if needed
-		$query = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '{$dbname}' AND TABLE_NAME = '{$dbtableprefix}users'";
-		$result = sqlsrv_query($connection, $query);
-		if ($result === false) {
-			if ( ($errors = sqlsrv_errors() ) != null) {
-				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-			} else {
-				$entry = '';
-			}
-			$entry.='Offending command was: '.$query.'<br />';
-			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-		} else {
-			$row = sqlsrv_fetch_array($result);
-
-			if ($row === false) {
-				if ( ($errors = sqlsrv_errors() ) != null) {
-					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
-				} else {
-					$entry = '';
-				}
-				$entry.='Offending command was: '.$query.'<br />';
-				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
-			} else {
-				if ($row == null) {
-					OC_DB::createDbFromStructure('db_structure.xml');
-				}
-			}
-		}
-
-		sqlsrv_close($connection);
-	}
-
 	/**
 	 * create .htaccess files for apache hosts
 	 */
diff --git a/lib/setup/abstractdatabase.php b/lib/setup/abstractdatabase.php
new file mode 100644
index 0000000000..0beada7bd2
--- /dev/null
+++ b/lib/setup/abstractdatabase.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace OC\Setup;
+
+abstract class AbstractDatabase {
+	protected $trans;
+	protected $dbDefinitionFile;
+	protected $dbuser;
+	protected $dbpassword;
+	protected $dbname;
+	protected $dbhost;
+	protected $tableprefix;
+
+	public function __construct($trans, $dbDefinitionFile) {
+		$this->trans = $trans;
+		$this->dbDefinitionFile = $dbDefinitionFile;
+	}
+
+	public function validate($config) {
+		$errors = array();
+		if(empty($config['dbuser'])) {
+			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
+		}
+		if(empty($config['dbname'])) {
+			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
+		}
+		if(substr_count($config['dbname'], '.') >= 1) {
+			$errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
+		}
+		return $errors;
+	}
+
+	public function initialize($config) {
+		$dbuser = $config['dbuser'];
+		$dbpass = $config['dbpass'];
+		$dbname = $config['dbname'];
+		$dbhost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+		$dbtableprefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+
+		\OC_Config::setValue('dbname', $dbname);
+		\OC_Config::setValue('dbhost', $dbhost);
+		\OC_Config::setValue('dbtableprefix', $dbtableprefix);
+
+		$this->dbuser = $dbuser;
+		$this->dbpassword = $dbpass;
+		$this->dbname = $dbname;
+		$this->dbhost = $dbhost;
+		$this->tableprefix = $dbtableprefix;
+	}
+}
diff --git a/lib/setup/mssql.php b/lib/setup/mssql.php
new file mode 100644
index 0000000000..b8329f9907
--- /dev/null
+++ b/lib/setup/mssql.php
@@ -0,0 +1,182 @@
+<?php
+
+namespace OC\Setup;
+
+class MSSQL extends AbstractDatabase {
+	public $dbprettyname = 'MS SQL Server';
+
+	public function setupDatabase() {
+		//check if the database user has admin right
+		$masterConnectionInfo = array( "Database" => "master", "UID" => $this->dbuser, "PWD" => $this->dbpassword);
+
+		$masterConnection = @sqlsrv_connect($this->dbhost, $masterConnectionInfo);
+		if(!$masterConnection) {
+			$entry = null;
+			if( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			throw new \DatabaseSetupException($this->trans->t('MS SQL username and/or password not valid: %s', array($entry)),
+					$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+
+		\OC_Config::setValue('dbuser', $this->dbuser);
+		\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+		$this->createDBLogin($masterConnection);
+
+		$this->createDatabase($masterConnection);
+
+		$this->createDBUser($masterConnection);
+
+		sqlsrv_close($masterConnection);
+
+		$this->createDatabaseStructure();
+	}
+
+	private function createDBLogin($connection) {
+		$query = "SELECT * FROM master.sys.server_principals WHERE name = '".$this->dbuser."';";
+		$result = sqlsrv_query($connection, $query);
+		if ($result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		} else {
+			$row = sqlsrv_fetch_array($result);
+
+			if ($row === false) {
+				if ( ($errors = sqlsrv_errors() ) != null) {
+					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+				} else {
+					$entry = '';
+				}
+				$entry.='Offending command was: '.$query.'<br />';
+				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+			} else {
+				if ($row == null) {
+					$query = "CREATE LOGIN [".$this->dbuser."] WITH PASSWORD = '".$this->dbpassword."';";
+					$result = sqlsrv_query($connection, $query);
+					if (!$result or $result === false) {
+						if ( ($errors = sqlsrv_errors() ) != null) {
+							$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+						} else {
+							$entry = '';
+						}
+						$entry.='Offending command was: '.$query.'<br />';
+						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+					}
+				}
+			}
+		}
+	}
+
+	private function createDBUser($connection) {
+		$query = "SELECT * FROM [".$this->dbname."].sys.database_principals WHERE name = '".$this->dbuser."';";
+		$result = sqlsrv_query($connection, $query);
+		if ($result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		} else {
+			$row = sqlsrv_fetch_array($result);
+
+			if ($row === false) {
+				if ( ($errors = sqlsrv_errors() ) != null) {
+					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+				} else {
+					$entry = '';
+				}
+				$entry.='Offending command was: '.$query.'<br />';
+				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+			} else {
+				if ($row == null) {
+					$query = "USE [".$this->dbname."]; CREATE USER [".$this->dbuser."] FOR LOGIN [".$this->dbuser."];";
+					$result = sqlsrv_query($connection, $query);
+					if (!$result || $result === false) {
+						if ( ($errors = sqlsrv_errors() ) != null) {
+							$entry = 'DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+						} else {
+							$entry = '';
+						}
+						$entry.='Offending command was: '.$query.'<br />';
+						\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+					}
+				}
+
+				$query = "USE [".$this->dbname."]; EXEC sp_addrolemember 'db_owner', '".$this->dbuser."';";
+				$result = sqlsrv_query($connection, $query);
+				if (!$result || $result === false) {
+					if ( ($errors = sqlsrv_errors() ) != null) {
+						$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+					} else {
+						$entry = '';
+					}
+					$entry.='Offending command was: '.$query.'<br />';
+					\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+				}
+			}
+		}
+	}
+
+	private function createDatabase($connection) {
+		$query = "CREATE DATABASE [".$this->dbname."];";
+		$result = sqlsrv_query($connection, $query);
+		if (!$result || $result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		}
+	}
+
+	private function createDatabaseStructure() {
+		$connectionInfo = array( "Database" => $this->dbname, "UID" => $this->dbuser, "PWD" => $this->dbpassword);
+
+		$connection = @sqlsrv_connect($this->dbhost, $connectionInfo);
+
+		//fill the database if needed
+		$query = "SELECT * FROM INFORMATION_SCHEMA.TABLES"
+			." WHERE TABLE_SCHEMA = '".$this->dbname."'"
+			." AND TABLE_NAME = '".$this->tableprefix."users'";
+		$result = sqlsrv_query($connection, $query);
+		if ($result === false) {
+			if ( ($errors = sqlsrv_errors() ) != null) {
+				$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+			} else {
+				$entry = '';
+			}
+			$entry.='Offending command was: '.$query.'<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		} else {
+			$row = sqlsrv_fetch_array($result);
+
+			if ($row === false) {
+				if ( ($errors = sqlsrv_errors() ) != null) {
+					$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
+				} else {
+					$entry = '';
+				}
+				$entry.='Offending command was: '.$query.'<br />';
+				\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+			} else {
+				if ($row == null) {
+					\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+				}
+			}
+		}
+
+		sqlsrv_close($connection);
+	}
+}
diff --git a/lib/setup/mysql.php b/lib/setup/mysql.php
new file mode 100644
index 0000000000..0cf04fde5a
--- /dev/null
+++ b/lib/setup/mysql.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace OC\Setup;
+
+class MySQL extends AbstractDatabase {
+	public $dbprettyname = 'MySQL';
+
+	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'),
+				$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+		$oldUser=\OC_Config::getValue('dbuser', false);
+
+		//this should be enough to check for admin rights in mysql
+		$query="SELECT user FROM mysql.user WHERE user='$this->dbuser'";
+		if(mysql_query($query, $connection)) {
+			//use the admin login data for the new database user
+
+			//add prefix to the mysql user name to prevent collisions
+			$this->dbuser=substr('oc_'.$username, 0, 16);
+			if($this->dbuser!=$oldUser) {
+				//hash the password so we don't need to store the admin config in the config file
+				$this->dbpassword=\OC_Util::generate_random_bytes(30);
+
+				$this->createDBUser($connection);
+
+				\OC_Config::setValue('dbuser', $this->dbuser);
+				\OC_Config::setValue('dbpassword', $this->dbpassword);
+			}
+
+			//create the database
+			$this->createDatabase($connection);
+		}
+		else {
+			if($this->dbuser!=$oldUser) {
+				\OC_Config::setValue('dbuser', $this->dbuser);
+				\OC_Config::setValue('dbpassword', $this->dbpassword);
+			}
+
+			//create the database
+			$this->createDatabase($connection);
+		}
+
+		//fill the database if needed
+		$query='select count(*) from information_schema.tables'
+			." where table_schema='".$this->dbname."' AND table_name = '".$this->tableprefix."users';";
+		$result = mysql_query($query, $connection);
+		if($result) {
+			$row=mysql_fetch_row($result);
+		}
+		if(!$result or $row[0]==0) {
+			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+		}
+		mysql_close($connection);
+	}
+
+	private function createDatabase($connection) {
+		$name = $this->dbname;
+		$user = $this->dbuser;
+		//we cant use OC_BD functions here because we need to connect as the administrative user.
+		$query = "CREATE DATABASE IF NOT EXISTS `$name`";
+		$result = mysql_query($query, $connection);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(mysql_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.mssql', $entry, \OC_Log::WARN);
+		}
+		$query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
+
+		//this query will fail if there aren't the right permissions, ignore the error
+		mysql_query($query, $connection);
+	}
+
+	private function createDBUser($connection) {
+		$name = $this->dbuser;
+		$password = $this->dbpassword;
+		// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
+		// the anonymous user would take precedence when there is one.
+		$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)));
+		}
+		$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."));
+		}
+	}
+}
diff --git a/lib/setup/oci.php b/lib/setup/oci.php
new file mode 100644
index 0000000000..577948766b
--- /dev/null
+++ b/lib/setup/oci.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace OC\Setup;
+
+class OCI extends AbstractDatabase {
+	public $dbprettyname = 'Oracle';
+
+	protected $dbtablespace;
+
+	public function initialize($config) {
+		parent::initialize($config);
+		if (array_key_exists('dbtablespace', $options)) {
+			$this->dbtablespace = $options['dbtablespace'];
+		} else {
+			$this->dbtablespace = 'USERS';
+		}
+		\OC_Config::setValue('dbtablespace', $this->dbtablespace);
+	}
+
+	public function setupDatabase($username) {
+		$e_host = addslashes($this->dbhost);
+		$e_dbname = addslashes($this->dbname);
+		//check if the database user has admin right
+		if ($e_host == '') {
+			$easy_connect_string = $e_dbname; // use dbname as easy connect name
+		} else {
+			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
+		}
+		\OC_Log::write('setup oracle', 'connect string: ' . $easy_connect_string, \OC_Log::DEBUG);
+		$connection = @oci_connect($this->dbuser, $this->dbpassword, $easy_connect_string);
+		if(!$connection) {
+			$e = oci_error();
+			if (is_array ($e) && isset ($e['message'])) {
+				throw new DatabaseSetupException($l->t('Oracle connection could not be established'),
+				$e['message'].' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+							.' ORACLE_SID='.getenv('ORACLE_SID')
+							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+							.' NLS_LANG='.getenv('NLS_LANG')
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+			}
+			throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'),
+					'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+							.' ORACLE_SID='.getenv('ORACLE_SID')
+							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+							.' NLS_LANG='.getenv('NLS_LANG')
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+		}
+		//check for roles creation rights in oracle
+
+		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
+			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
+		$stmt = oci_parse($connection, $query);
+		if (!$stmt) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_last_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+		$result = oci_execute($stmt);
+		if($result) {
+			$row = oci_fetch_row($stmt);
+		}
+		if($result and $row[0] > 0) {
+			//use the admin login data for the new database user
+
+			//add prefix to the oracle user name to prevent collisions
+			$this->dbuser='oc_'.$username;
+			//create a new password so we don't need to store the admin config in the config file
+			$this->dbpassword=\OC_Util::generate_random_bytes(30);
+
+			//oracle passwords are treated as identifiers:
+			//  must start with aphanumeric char
+			//  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
+			$this->dbpassword=substr($this->dbpassword, 0, 30);
+
+			$this->createDBUser($connection);
+
+			\OC_Config::setValue('dbuser', $this->dbusername);
+			\OC_Config::setValue('dbname', $this->dbusername);
+			\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+			//create the database not neccessary, oracle implies user = schema
+			//$this->createDatabase($this->dbname, $this->dbusername, $connection);
+		} else {
+
+			\OC_Config::setValue('dbuser', $this->dbuser);
+			\OC_Config::setValue('dbname', $this->dbname);
+			\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+			//create the database not neccessary, oracle implies user = schema
+			//$this->createDatabase($this->dbname, $this->dbuser, $connection);
+		}
+
+		//FIXME check tablespace exists: select * from user_tablespaces
+
+		// the connection to dbname=oracle is not needed anymore
+		oci_close($connection);
+
+		// connect to the oracle database (schema=$this->dbuser) an check if the schema needs to be filled
+		$this->dbuser = \OC_Config::getValue('dbuser');
+		//$this->dbname = \OC_Config::getValue('dbname');
+		$this->dbpassword = \OC_Config::getValue('dbpassword');
+
+		$e_host = addslashes($this->dbhost);
+		$e_dbname = addslashes($this->dbname);
+
+		if ($e_host == '') {
+			$easy_connect_string = $e_dbname; // use dbname as easy connect name
+		} else {
+			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
+		}
+		$connection = @oci_connect($this->dbuser, $this->dbpassword, $easy_connect_string);
+		if(!$connection) {
+			throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+					$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+		$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
+		$stmt = oci_parse($connection, $query);
+		$un = $this->dbtableprefix.'users';
+		oci_bind_by_name($stmt, ':un', $un);
+		if (!$stmt) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+		$result = oci_execute($stmt);
+
+		if($result) {
+			$row = oci_fetch_row($stmt);
+		}
+		if(!$result or $row[0]==0) {
+			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+		}
+	}
+
+	/**
+	 *
+	 * @param String $name
+	 * @param String $password
+	 * @param resource $connection
+	 */
+	private function createDBUser($connection) {
+		$name = $this->dbuser;
+		$password = $this->password;
+		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
+		$stmt = oci_parse($connection, $query);
+		if (!$stmt) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+		oci_bind_by_name($stmt, ':un', $name);
+		$result = oci_execute($stmt);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+
+		if(! oci_fetch_row($stmt)) {
+			//user does not exists let's create it :)
+			//password must start with alphabetic character in oracle
+			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$this->dbtablespace;
+			$stmt = oci_parse($connection, $query);
+			if (!$stmt) {
+				$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+			}
+			//oci_bind_by_name($stmt, ':un', $name);
+			$result = oci_execute($stmt);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
+					array($query, $name, $password)) . '<br />';
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+			}
+		} else { // change password of the existing role
+			$query = "ALTER USER :un IDENTIFIED BY :pw";
+			$stmt = oci_parse($connection, $query);
+			if (!$stmt) {
+				$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+			}
+			oci_bind_by_name($stmt, ':un', $name);
+			oci_bind_by_name($stmt, ':pw', $password);
+			$result = oci_execute($stmt);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+			}
+		}
+		// grant necessary roles
+		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
+		$stmt = oci_parse($connection, $query);
+		if (!$stmt) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+		$result = oci_execute($stmt);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
+				array($query, $name, $password)) . '<br />';
+			\OC_Log::write('setup.oci', $entry, \OC_Log::WARN);
+		}
+	}
+}
diff --git a/lib/setup/postgresql.php b/lib/setup/postgresql.php
new file mode 100644
index 0000000000..49fcbf0326
--- /dev/null
+++ b/lib/setup/postgresql.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace OC\Setup;
+
+class PostgreSQL extends AbstractDatabase {
+	public $dbprettyname = 'PostgreSQL';
+
+	public function setupDatabase($username) {
+		$e_host = addslashes($this->dbhost);
+		$e_user = addslashes($this->dbuser);
+		$e_password = addslashes($this->dbpassword);
+
+		//check if the database user has admin rights
+		$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'";
+		$connection = @pg_connect($connection_string);
+		if(!$connection) {
+			// Try if we can connect to the DB with the specified name
+			$e_dbname = addslashes($this->dbname);
+			$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
+			$connection = @pg_connect($connection_string);
+
+			if(!$connection)
+				throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+						$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+		$e_user = pg_escape_string($this->dbuser);
+		//check for roles creation rights in postgresql
+		$query="SELECT 1 FROM pg_roles WHERE rolcreaterole=TRUE AND rolname='$e_user'";
+		$result = pg_query($connection, $query);
+		if($result and pg_num_rows($result) > 0) {
+			//use the admin login data for the new database user
+
+			//add prefix to the postgresql user name to prevent collisions
+			$this->dbuser='oc_'.$username;
+			//create a new password so we don't need to store the admin config in the config file
+			$this->dbpassword=\OC_Util::generate_random_bytes(30);
+
+			$this->createDBUser($connection);
+
+			\OC_Config::setValue('dbuser', $this->dbuser);
+			\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+			//create the database
+			$this->createDatabase($connection);
+		}
+		else {
+			\OC_Config::setValue('dbuser', $this->dbuser);
+			\OC_Config::setValue('dbpassword', $this->dbpassword);
+
+			//create the database
+			$this->createDatabase($connection);
+		}
+
+		// the connection to dbname=postgres is not needed anymore
+		pg_close($connection);
+
+		// connect to the ownCloud database (dbname=$this->dbname) and check if it needs to be filled
+		$this->dbuser = \OC_Config::getValue('dbuser');
+		$this->dbpassword = \OC_Config::getValue('dbpassword');
+
+		$e_host = addslashes($this->dbhost);
+		$e_dbname = addslashes($this->dbname);
+		$e_user = addslashes($this->dbuser);
+		$e_password = addslashes($this->dbpassword);
+
+		$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
+		$connection = @pg_connect($connection_string);
+		if(!$connection) {
+			throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+					$this->trans->t('You need to enter either an existing account or the administrator.'));
+		}
+		$query = "select count(*) FROM pg_class WHERE relname='".$this->tableprefix."users' limit 1";
+		$result = pg_query($connection, $query);
+		if($result) {
+			$row = pg_fetch_row($result);
+		}
+		if(!$result or $row[0]==0) {
+			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+		}
+	}
+
+	private function createDatabase($connection) {
+		//we cant use OC_BD functions here because we need to connect as the administrative user.
+		$e_name = pg_escape_string($this->dbname);
+		$e_user = pg_escape_string($this->dbuser);
+		$query = "select datname from pg_database where datname = '$e_name'";
+		$result = pg_query($connection, $query);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+		}
+		if(! pg_fetch_row($result)) {
+			//The database does not exists... let's create it
+			$query = "CREATE DATABASE \"$e_name\" OWNER \"$e_user\"";
+			$result = pg_query($connection, $query);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+			}
+			else {
+				$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
+				pg_query($connection, $query);
+			}
+		}
+	}
+
+	private function createDBUser($connection) {
+		$e_name = pg_escape_string($this->dbuser);
+		$e_password = pg_escape_string($this->dbpassword);
+		$query = "select * from pg_roles where rolname='$e_name';";
+		$result = pg_query($connection, $query);
+		if(!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+		}
+
+		if(! pg_fetch_row($result)) {
+			//user does not exists let's create it :)
+			$query = "CREATE USER \"$e_name\" CREATEDB PASSWORD '$e_password';";
+			$result = pg_query($connection, $query);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+			}
+		}
+		else { // change password of the existing role
+			$query = "ALTER ROLE \"$e_name\" WITH PASSWORD '$e_password';";
+			$result = pg_query($connection, $query);
+			if(!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
+			}
+		}
+	}
+}
diff --git a/lib/setup/sqlite.php b/lib/setup/sqlite.php
new file mode 100644
index 0000000000..fd4df792d6
--- /dev/null
+++ b/lib/setup/sqlite.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace OC\Setup;
+
+class Sqlite extends AbstractDatabase {
+	public $dbprettyname = 'Sqlite';
+
+	public function validate($config) {
+		return array();
+	}
+
+	public function initialize($config) {
+	}
+
+	public function setupDatabase($username) {
+		$datadir = \OC_Config::getValue('datadirectory');
+
+		//delete the old sqlite database first, might cause infinte loops otherwise
+		if(file_exists("$datadir/owncloud.db")) {
+			unlink("$datadir/owncloud.db");
+		}
+		//in case of sqlite, we can always fill the database
+		error_log("creating sqlite db");
+		\OC_DB::createDbFromStructure($this->dbDefinitionFile);
+	}
+}