diff --git a/core/css/styles.css b/core/css/styles.css
index be42fedd912c47ab6401ca278d11d9857cf36a5d..a9ffd83629b85abe0a6e815d22327591265df578 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -558,7 +558,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 }
 
 
-#body-login p.info{
+#body-login footer .info {
 	white-space: nowrap;
 }
 
diff --git a/core/js/setup.js b/core/js/setup.js
index d28f15a0a034821f8bea59faede426fef60367c2..3b2c13bd421e32a721009ce2b19ef5d0b4b3b59d 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -13,6 +13,8 @@ $(document).ready(function() {
 	if($('#hasSQLite').val()){
 		$('#use_other_db').hide();
 		$('#use_oracle_db').hide();
+	} else {
+		$('#sqliteInformation').hide();
 	}
 	$('#adminlogin').change(function(){
 		$('#adminlogin').val($.trim($('#adminlogin').val()));
@@ -20,16 +22,19 @@ $(document).ready(function() {
 	$('#sqlite').click(function() {
 		$('#use_other_db').slideUp(250);
 		$('#use_oracle_db').slideUp(250);
+		$('#sqliteInformation').show();
 	});
 
 	$('#mysql,#pgsql,#mssql').click(function() {
 		$('#use_other_db').slideDown(250);
 		$('#use_oracle_db').slideUp(250);
+		$('#sqliteInformation').hide();
 	});
 
 	$('#oci').click(function() {
 		$('#use_other_db').slideDown(250);
 		$('#use_oracle_db').show(250);
+		$('#sqliteInformation').hide();
 	});
 
 	$('input[checked]').trigger('click');
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 709207e79772491edcdbee50bae31ae2a4439abb..6d73fb431f5f49d04d55ab988ac9d0e1be8c4798 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -91,7 +91,7 @@
 		<div id="selectDbType">
 		<?php foreach($_['databases'] as $type => $label): ?>
 		<?php if(count($_['databases']) === 1): ?>
-		<p class="info"><?php p($label . ' ' . $l->t( 'will be used' )); ?>.</p>
+		<p class="info"><?php p($l->t( 'Only %s is available.', array($label) )); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>" />
 		<?php else: ?>
 		<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
@@ -112,7 +112,7 @@
 					autocomplete="off" autocapitalize="off" autocorrect="off" />
 			</p>
 			<p class="infield groupmiddle">
-				<input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword" 
+				<input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword"
 					value="<?php p($_['dbpass']); ?>"
 					autocomplete="off" autocapitalize="off" autocorrect="off" />
 				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
@@ -147,5 +147,7 @@
 		<?php endif; ?>
 	<?php endif; ?>
 
+	<p id="sqliteInformation" class="info"><?php p($l->t('SQLite will be used as database. For larger installations we recommend to change this.'));?></p>
+
 	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>
 </form>
diff --git a/settings/admin.php b/settings/admin.php
index a0769892ef44d553b9368ab65dc520c9f913918b..fc76d3d74aba74b0c79b55916f6834d4e57b2f9e 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -88,6 +88,10 @@ $tmpl->assign('forms', array());
 foreach($forms as $form) {
 	$tmpl->append('forms', $form);
 }
+
+$databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false);
+$tmpl->assign('databaseOverload', $databaseOverload);
+
 $tmpl->printPage();
 
 /**
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index cb57bc0ce7252f8fb128b5a4e15d07eb015f9c9f..c8ca031ec986dd93d09db44c07c04706a3b4fec1 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -98,6 +98,20 @@ if (!$_['isAnnotationsWorking']) {
 <?php
 }
 
+// SQLite database performance issue
+if ($_['databaseOverload']) {
+	?>
+<div class="section">
+	<h2><?php p($l->t('Database Performance Info'));?></h2>
+
+	<p class="securitywarning">
+		<?php p($l->t('SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: \'occ db:convert-type\'')); ?>
+	</p>
+
+</div>
+<?php
+}
+
 // if module fileinfo available?
 if (!$_['has_fileinfo']) {
 	?>