diff --git a/files/index.php b/files/index.php
index 28743f77fc..c0f078bd21 100644
--- a/files/index.php
+++ b/files/index.php
@@ -61,11 +61,14 @@ $list->assign( "files", $files );
 $breadcrumbNav = new OC_TEMPLATE( "files", "part.breadcrumb", "" );
 $breadcrumbNav->assign( "breadcrumb", $breadcrumb );
 
+$maxUploadFilesize = OC_HELPER::computerFileSize(ini_get('upload_max_filesize'));
+
 $tmpl = new OC_TEMPLATE( "files", "index", "user" );
 $tmpl->assign( "fileList", $list->fetchPage() );
 $tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
 $tmpl->assign( 'dir', $dir);
-$tmpl->assign( 'uploadMaxFilesize', OC_HELPER::computerFileSize(ini_get('upload_max_filesize')));
+$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign( 'uploadMaxHumanFilesize', OC_HELPER::humanFileSize($maxUploadFilesize));
 $tmpl->printPage();
 
 ?>
diff --git a/files/templates/index.php b/files/templates/index.php
index c6dc123cee..b556da5513 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -11,7 +11,7 @@ method="post" enctype="multipart/form-data" target="file_upload_target"><input
 type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_["uploadMaxFilesize"] ?>" id="max_upload"><input
 type="hidden" name="dir" value="<?php echo $_["dir"] ?>" id="dir"><input
 type="file" name="file" id="fileSelector"><input type="submit"
-id="file_upload_start" value="Upload" /><iframe id="file_upload_target"
+id="file_upload_start" value="Upload (max <?php echo $_["uploadMaxHumanFilesize"];?>)" /><iframe id="file_upload_target"
 name="file_upload_target" src=""></iframe></form>
 		<form id="file_newfolder_form"><input type="text" name="file_new_dir_name" id="file_new_dir_name" />&nbsp;<input type="button" id="file_new_dir_submit" name="file_new_dir_submit" value="OK" /></form>
 	</div>