diff --git a/op/op.AddFile2.php b/op/op.AddFile2.php
new file mode 100644
index 000000000..c51f6ca7f
--- /dev/null
+++ b/op/op.AddFile2.php
@@ -0,0 +1,104 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.ClassEmail.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+$file_param_name = 'file';
+$file_name = $_FILES[ $file_param_name ][ 'name' ];
+$source_file_path = $_FILES[ $file_param_name ][ 'tmp_name' ];
+$target_file_path =$settings->_stagingDir.$_POST['fileId']."-".$_POST['partitionIndex'];
+if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
+	if($_POST['partitionIndex']+1 == $_POST['partitionCount']) {
+		$fpnew = fopen($settings->_stagingDir.$_POST['fileId'], 'w+');
+		for($i=0; $i<$_POST['partitionCount']; $i++) {
+			$content = file_get_contents($settings->_stagingDir.$_POST['fileId']."-".$i, 'r');
+			fwrite($fpnew, $content);
+			unlink($settings->_stagingDir.$_POST['fileId']."-".$i);
+		}
+		fclose($fpnew);
+
+		if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+			echo getMLText("invalid_doc_id");
+		}
+
+		$documentid = $_POST["documentid"];
+		$document = $dms->getDocument($documentid);
+
+		if (!is_object($document)) {
+			echo getMLText("invalid_doc_id");
+		}
+
+		$folder = $document->getFolder();
+
+		if ($document->getAccessMode($user) < M_READWRITE) {
+			echo getMLText("access_denied");
+		}
+
+		$userfiletmp = $settings->_stagingDir.$_POST['fileId'];;
+		$userfiletype = $_FILES[ $file_param_name ]["type"];
+		$userfilename = $_FILES[ $file_param_name ]["name"];
+
+		$name     = sanitizeString($_POST["name"]);
+		if(!$name)
+			$name = $userfilename;
+		$comment  = sanitizeString($_POST["comment"]);
+
+		$lastDotIndex = strrpos(basename($userfilename), ".");
+		if (is_bool($lastDotIndex) && !$lastDotIndex)
+			$fileType = ".";
+		else
+			$fileType = substr($userfilename, $lastDotIndex);
+
+		$res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
+																			basename($userfilename),$fileType, $userfiletype );
+																		
+		if (is_bool($res) && !$res) {
+			UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
+		} else {
+			$document->getNotifyList();
+			// Send notification to subscribers.
+			if($notifier) {
+				$subject = "###SITENAME###: ".$document->_name." - ".getMLText("new_file_email");
+				$message = getMLText("new_file_email")."\r\n";
+				$message .= 
+					getMLText("name").": ".$name."\r\n".
+					getMLText("comment").": ".$comment."\r\n".
+					getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".	
+					"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
+
+				$subject=mydmsDecodeString($subject);
+				$message=mydmsDecodeString($message);
+				
+				$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
+				foreach ($document->_notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message);
+				}
+			}
+		}
+		add_log_line("?name=".$name."&documentid=".$documentid);
+	}
+}
+
+?>
diff --git a/out/out.AddFile2.php b/out/out.AddFile2.php
new file mode 100644
index 000000000..0e92a2066
--- /dev/null
+++ b/out/out.AddFile2.php
@@ -0,0 +1,57 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"]<1)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$documentid = $_GET["documentid"];
+$document = $dms->getDocument($documentid);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$folder = $document->getFolder();
+$docPathHTML = getFolderPathHTML($folder, true). " / <a href=\"../out/out.ViewDocument.php?documentid=".$documentid."\">".$document->getName()."</a>";
+
+if ($document->getAccessMode($user) < M_READWRITE) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
+UI::htmlStartPage(getMLText("document_title", array("documentname" => $document->getName())));
+UI::globalNavigation($folder);
+UI::pageNavigation($docPathHTML, "view_document");
+
+UI::contentHeading(getMLText("linked_files"));
+UI::contentContainerStart();
+
+UI::printUploadApplet('../op/op.AddFile2.php', array('documentid'=>$document->getId()), 1, array('name'=>1, 'comment'=>1));
+
+UI::contentContainerEnd();
+UI::htmlEndPage();
+?>