diff --git a/.htaccess b/.htaccess
index c818c9ca2ea..23c90b26d8c 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,5 @@
-ErrorDocument 404 //core/templates/404.php
-php_value upload_max_filesize 20M
-php_value post_max_size 20M
+ErrorDocument 404 //owncloud/core/templates/404.php
+php_value upload_max_filesize 2048G
+php_value post_max_size 2048G
 SetEnv htaccessWorking true
 Options -Indexes
diff --git a/files/templates/index.php b/files/templates/index.php
index 083322174e7..407cfa78c2f 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -6,7 +6,8 @@
 			<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 			<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 			<div class="file_upload_wrapper" class="svg">
-				<input type="submit" class="file_upload_filename" value="<?php echo $l->t('Upload');?> (max. <?php echo $_['uploadMaxHumanFilesize'];?>)"/>
+				<input type="submit" class="file_upload_filename" value="<?php echo $l->t('Upload');
+				 if($_['uploadMaxFilesize']<(10000000000)){echo ' (max. '.$_['uploadMaxHumanFilesize'].')';}?>"/>
 				<input class="file_upload_start" type="file" name='files[]'/>
 			</div>
 			<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>