diff --git a/files/index.php b/files/index.php
index 638f5d0c51..e07e80aabb 100644
--- a/files/index.php
+++ b/files/index.php
@@ -60,6 +60,7 @@ $tmpl = new OC_TEMPLATE( "files", "index", "user" );
 $tmpl->assign( "files", $files );
 $tmpl->assign( "breadcrumb", $breadcrumb );
 $tmpl->assign( 'dir', $dir);
+$tmpl->assign( 'uploadMaxFilesize', OC_HELPER::computerFileSize(ini_get('upload_max_filesize')));
 $tmpl->printPage();
 
 ?>
diff --git a/files/templates/index.php b/files/templates/index.php
index 49742a9813..40113c9fe0 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -8,7 +8,7 @@ href="" title="" class="delete">Delete</a>
 	<div id="file_upload_form">
 		<form action="ajax/upload.php"
 method="post" enctype="multipart/form-data" target="file_upload_target"><input
-type="hidden" name="MAX_FILE_SIZE" value="2097152" id="max_upload"><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"
diff --git a/lib/helper.php b/lib/helper.php
index 7c7fe2757e..ff16d5894b 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -118,6 +118,43 @@ class OC_HELPER {
 		return "$bytes GB";
 	}
 	
+	/**
+	 * @brief Make a computer file size
+	 * @param $str file size in a fancy format
+	 * @returns a file size in bytes
+	 *
+	 * Makes 2kB to 2048.
+	 *
+	 * Inspired by: http://www.php.net/manual/en/function.filesize.php#92418
+	 */
+	public static function computerFileSize( $str ){
+		$bytes = 0;
+
+		$bytes_array = array(
+			'B' => 1,
+			'K' => 1024,
+			'KB' => 1024,
+			'MB' => 1024 * 1024,
+			'M'  => 1024 * 1024,
+			'GB' => 1024 * 1024 * 1024,
+			'G'  => 1024 * 1024 * 1024,
+			'TB' => 1024 * 1024 * 1024 * 1024,
+			'T'  => 1024 * 1024 * 1024 * 1024,
+			'PB' => 1024 * 1024 * 1024 * 1024 * 1024,
+			'P'  => 1024 * 1024 * 1024 * 1024 * 1024,
+		);
+
+		$bytes = floatval($str);
+
+		if (preg_match('#([KMGTP]?B?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
+			$bytes *= $bytes_array[$matches[1]];
+		}
+
+		$bytes = intval(round($bytes, 2));
+
+		return $bytes; 
+	}
+	
 	/**
 	 * @brief Recusive editing of file permissions
 	 * @param $path path to file or folder