diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index e69de29..0000000
diff --git a/distro/LICENSE b/distro/LICENSE
index cdb5851..2d9616a 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,7 +1 @@
-gCube System - License
-------------------------------------------------------------
-
-The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl).
-The software and documentation is provided by its authors/distributors "as is" and no expressed or 
-implied warranty is given for its use, quality or fitness for a particular case.
-
+${gcube.license}
\ No newline at end of file
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index d43c386..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,4 +0,0 @@
-Mantainers
--------
-
-* Francesco Mangiacrapa (francesco.mangiacrapa@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
diff --git a/distro/README b/distro/README
index e41f588..2f58ae6 100644
--- a/distro/README
+++ b/distro/README
@@ -1,45 +1,60 @@
-The gCube System - WorkspacePortlet
-------------------------------------------------------------
-
-This work is partially funded by the European Commission in the
-context of the iMarine project (http://www.i-marine.eu).
-
-
-Authors
--------
-
-* Francesco Mangiacrapa (francesco.mangiacrapa@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-
-
-Version and Release Date
-------------------------
-
-v. 1.5.1
+The gCube System - ${name}
+--------------------------------------------------
  
-
-Description
+${description}
+ 
+ 
+${gcube.description}
+ 
+${gcube.funding}
+ 
+ 
+Version
+--------------------------------------------------
+ 
+${version} (${buildDate})
+ 
+Please see the file named "changelog.xml" in this directory for the release notes.
+ 
+ 
+Authors
+--------------------------------------------------
+ 
+* Francesco Mangiacrapa (francesco.mangiacrapa-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). 
+ 
+Maintainers
 -----------
-
-The Workspace Sharing Widget is a widget to share workspace items among portal users. 
-
+ 
+* Francesco Mangiacrapa (francesco.mangiacrapa-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). 
+ 
 Download information
---------------------
-
-Source code is available from SVN:
-http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/workspace-sharing-widget
-
-Binaries can be downloaded from:
-n/a
-
+--------------------------------------------------
+ 
+Source code is available from SVN: 
+    ${scm.url}
+ 
+Binaries can be downloaded from the gCube website: 
+   ${gcube.website}
+ 
+ 
+Installation
+--------------------------------------------------
 
+ 
 Documentation 
--------------
-Documentation is available on-line from the Projects Documentation Wiki:
-https://gcube.wiki.gcube-system.org/gcube/index.php/GCube_Widgets_Store
-
-
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/gcube/GCube_Widgets_Store#Workspace_Sharing_Widget
+ 
+Support 
+--------------------------------------------------
+ 
+Bugs and support requests can be reported in the gCube issue tracking tool:
+    ${gcube.issueTracking}
+ 
+ 
 Licensing
----------
-
+--------------------------------------------------
+ 
 This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
\ No newline at end of file
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index edacb04..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-${scm.url} 
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3d285f7..efb95a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<version>1.5.1-SNAPSHOT</version>
 	<name>gCube Workspace Sharing Widget</name>
 	<description>
-		gCube Workspace Sharing Widget
+		gCube Workspace Sharing Widget allows users to share gCube Workspace items
 	</description>
 
 	<scm>