diff --git a/CHANGELOG b/CHANGELOG
index 70d90e774..1fe1294a5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.7
+--------------------------------------------------------------------------------
+- fix editing of document attachments
+- merge changes up to 5.1.7
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.6
 --------------------------------------------------------------------------------
diff --git a/out/out.EditDocumentFile.php b/out/out.EditDocumentFile.php
index baab461d9..0ffc8c82e 100644
--- a/out/out.EditDocumentFile.php
+++ b/out/out.EditDocumentFile.php
@@ -30,7 +30,7 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 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"));