diff --git a/css/style.css b/css/style.css
index 3632df52..6e9ff779 100755
--- a/css/style.css
+++ b/css/style.css
@@ -139,4 +139,14 @@
 
 #members{
 	padding-top: 3em !important;
+}
+
+#file_upload_start{
+	position:relative;
+	left:0; top:0; width:200px; height:200px; 
+	margin-bottom: -200px;padding:0;
+	cursor:pointer; overflow:hidden;
+	font-size:1em;
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
+	z-index:20; 
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index 6e5f9fb2..99d62701 100755
--- a/index.php
+++ b/index.php
@@ -33,6 +33,14 @@ namespace OCA\Documents;
 \OCP\Util::addStyle( 'documents', 'editor' );
 \OCP\Util::addScript('documents', 'documents');
 
+\OCP\Util::addScript('files', 'file-upload');
+\OCP\Util::addScript('files', 'jquery.iframe-transport');
+\OCP\Util::addScript('files', 'jquery.fileupload');
+
+
 $tmpl = new \OCP\Template('documents', 'documents', 'user');
+$maxUploadFilesize = \OCP\Util::maxUploadFilesize("/");
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('uploadMaxHumanFilesize', \OCP\Util::humanFileSize($maxUploadFilesize));
 
 $tmpl->printPage();
diff --git a/js/documents.js b/js/documents.js
index 7ae33873..3c1b9024 100644
--- a/js/documents.js
+++ b/js/documents.js
@@ -314,6 +314,8 @@ $(document).ready(function() {
 	});
 
 	documentsMain.show();
+	var file_upload_start = $('#file_upload_start');
+	file_upload_start.on('fileuploaddone', documentsMain.show);
 	//TODO show "no docs, please upload"
 	//TODO when ending a session as the last user close session?
 
diff --git a/templates/documents.php b/templates/documents.php
index fdbc0d7d..eb0263bf 100755
--- a/templates/documents.php
+++ b/templates/documents.php
@@ -14,9 +14,29 @@
 			<a class="add svg" target="_blank" href="">
 				<label><?php p('Add') ?></label>
 			</a>
-			<a class="upload svg" target="_blank" href="">
-				<label><?php p('Upload') ?></label>
-			</a>
+			<div id="upload" title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
+				<form data-upload-id="1"
+					  id="data-upload-form"
+					  class="file_upload_form"
+					  action="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>"
+					  method="post"
+					  enctype="multipart/form-data"
+					  target="file_upload_target_1">
+					<?php if($_['uploadMaxFilesize'] >= 0):?>
+					<input type="hidden" name="MAX_FILE_SIZE" id="max_upload"
+						   value="<?php p($_['uploadMaxFilesize']) ?>">
+					<?php endif;?>
+					<!-- Send the requesttoken, this is needed for older IE versions
+						 because they don't send the CSRF token via HTTP header in this case -->
+					<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
+					<input type="hidden" class="max_human_file_size"
+						   value="(max <?php p($_['uploadMaxHumanFilesize']); ?>)">
+					<input type="hidden" name="dir" value="/" id="dir">
+					<input type="file" id="file_upload_start" name='files[]'/>
+					<a href="#" class="upload svg">
+					<label><?php p('Upload') ?></label></a>
+				</form>
+			</div>
 		</li>
 		<li class="document template" data-id="" style="display:none;">
 			<a target="_blank" href=""><label></label></a>