diff --git a/distro/README b/distro/README
index 6bb3957..22da7ce 100644
--- a/distro/README
+++ b/distro/README
@@ -18,7 +18,7 @@ Authors
 Version and Release Date
 ------------------------
 
-v. 5.0.0
+v. 6.0.0
 
 
 Description
diff --git a/distro/changelog.xml b/distro/changelog.xml
index a6c45f7..6eda522 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,71 +1,102 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.5-1-0" date="2012-09-21"> 
-		<Change>Old Send Message removed, added support for new mail sender</Change>
-			<Change>Bug fixed: upload file/archive</Change>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.6-0-0"
+		date="2012-03-05">
+		<Change>#1247 The workspace tree was mavenized</Change>
+		<Change>#230, #205 The Workspace environment now supports the sharing of folder between users</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.5-0-0" date="2012-05-04"> 
-		<Change>#216 New version of Workspace Tree is developed using the GXT framework</Change>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.5-1-0"
+		date="2012-09-21">
+		<Change>Old Send Message removed, added support for new mail sender
+		</Change>
+		<Change>Bug fixed: upload file/archive</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.5-0-0"
+		date="2012-05-04">
+		<Change>#216 New version of Workspace Tree is developed using the GXT
+			framework</Change>
 		<Change>#216 New tree is asynchronous</Change>
 		<Change>#216 Reviews tree GUI and adding new features</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.4-3-0" date="2011-09-01"> 
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.4-3-0"
+		date="2011-09-01">
 		<Change>#1740: ICIS / Download csv / added extension .xlw</Change>
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.4-2-0" date="2011-07-01"> 
-		<Change>#1555: WorkflowTemplate and WorkflowReport required in Workspace Portlet</Change>
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.4-1-0" date="2011-05-06"> 
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.4-2-0"
+		date="2011-07-01">
+		<Change>#1555: WorkflowTemplate and WorkflowReport required in
+			Workspace Portlet</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.4-1-0"
+		date="2011-05-06">
 		<Change>Synch with others changes in HomeLibrary</Change>
-		<Change>GWT 2.2.0</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.4-0-0" date="2011-02-07"> 
-		<Change>Removed Workspace and Basket type, replaced with folder option</Change>
-		<Change>Synch with others changes in HomeLibrary</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.3-2-1" date="2010-11-09"> 
-		<Change>Added more checks on GWT model construction</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.3-2-0" date="2010-10-22"> 
-		<Change>Enabled details panel for Report, ReportTemplate and AquaMapsItem workspace items</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.3-1-0" date="2010-09-03"> 
+		<Change>GWT 2.2.0</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.4-0-0"
+		date="2011-02-07">
+		<Change>Removed Workspace and Basket type, replaced with folder option
+		</Change>
+		<Change>Synch with others changes in HomeLibrary</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.3-2-1"
+		date="2010-11-09">
+		<Change>Added more checks on GWT model construction</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.3-2-0"
+		date="2010-10-22">
+		<Change>Enabled details panel for Report, ReportTemplate and
+			AquaMapsItem workspace items</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.3-1-0"
+		date="2010-09-03">
 		<Change>#36: ICIS / Workspace / Upload an archive</Change>
 		<Change>Merged ThumbnailServlet and ImageServlet</Change>
-		<Change>#774: Workspace portlet tree - Open Report / Template redirect link not working</Change>
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.3-0-0" date="2010-07-16"> 
-		<Change>Ported to GWT 2.0</Change> 
-		<Change>Updated project structure to WebPortlet</Change> 
-		<Change>Update to LifeRay portal</Change>
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-6-0" date="2010-05-14"> 
-		<Change>#424: Workspace code refactoring an enanchement</Change> 
-		<Change>refactored code</Change> 
-		<Change>uniformed icons, no more specialized action icons</Change> 
-		<Change>added more informations on items like AquaMapsItem, Report and Report Template</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-5-0" date="2010-01-29"> 
-		<Change>gcube release 1.7.0</Change> 
-	</Changeset> 
-		<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-4-0" date="2009-11-30"> 
-		<Change>gcube release 1.6.0</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-3-0" date="2009-11-16"> 
-		<Change>gcube release 1.5.0</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-2-0" date="2009-10-16"> 
-		<Change>gcube release</Change> 
+		<Change>#774: Workspace portlet tree - Open Report / Template redirect
+			link not working</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-1-1" date="2009-07-29"> 
-		<Change>gcube release 1.2.2</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-1-0" date="2009-07-14"> 
-		<Change>gcube release 1.2.0</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-0-0" date="2009-05-19"> 
-		<Change>gcube release 1.2.0 rc1</Change> 
-	</Changeset> 
-	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.1-1-2" date="2009-01-12">
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.3-0-0"
+		date="2010-07-16">
+		<Change>Ported to GWT 2.0</Change>
+		<Change>Updated project structure to WebPortlet</Change>
+		<Change>Update to LifeRay portal</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-6-0"
+		date="2010-05-14">
+		<Change>#424: Workspace code refactoring an enanchement</Change>
+		<Change>refactored code</Change>
+		<Change>uniformed icons, no more specialized action icons</Change>
+		<Change>added more informations on items like AquaMapsItem, Report and
+			Report Template</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-5-0"
+		date="2010-01-29">
+		<Change>gcube release 1.7.0</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-4-0"
+		date="2009-11-30">
+		<Change>gcube release 1.6.0</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-3-0"
+		date="2009-11-16">
+		<Change>gcube release 1.5.0</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-2-0"
+		date="2009-10-16">
+		<Change>gcube release</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-1-1"
+		date="2009-07-29">
+		<Change>gcube release 1.2.2</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-1-0"
+		date="2009-07-14">
+		<Change>gcube release 1.2.0</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.2-0-0"
+		date="2009-05-19">
+		<Change>gcube release 1.2.0 rc1</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet-tree.1-1-2"
+		date="2009-01-12">
 		<Change>first release</Change>
-	</Changeset> 
+	</Changeset>
 </ReleaseNotes>