diff --git a/distro/LICENSE b/distro/LICENSE
index bd0c2b4..2d9616a 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,8 +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/README b/distro/README
index 35c99c0..70cc12c 100644
--- a/distro/README
+++ b/distro/README
@@ -1,67 +1,45 @@
-The gCube System - ${name}
---------------------------------------------------
- 
-${description}
- 
- 
+The gCube System
+------------------------------------------------------------
+
 ${gcube.description}
  
 ${gcube.funding}
- 
- 
+
+
 Version
 --------------------------------------------------
- 
 ${version} (${buildDate})
  
 Please see the file named "changelog.xml" in this directory for the release notes.
- 
- 
+
+
 Authors
---------------------------------------------------
- 
-* Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+-------
 
  
- 
+Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+
+
 Maintainers
 -----------
  
-* Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
  
  
-Download information
---------------------------------------------------
- 
-Source code is available from SVN: 
-    ${scm.url}
- 
-Binaries can be downloaded from the gCube website: 
-   ${gcube.website}
- 
- 
-Installation
---------------------------------------------------
- 
-Installation documentation is available on-line in the gCube Wiki:
-    ${gcube.wikiRoot}/
- 
- 
-Documentation 
---------------------------------------------------
- 
-Documentation is available on-line in the gCube Wiki:
-    ${gcube.wikiRoot}/
-    ${gcube.wikiRoot}/
- 
+Documentation
+-------------
+
+Documentation is available on - line from the Projects Documentation wiki:
+
+ {gcube.wikiRoot}/gcube/index.php/UserManagement_Core
+
+
 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.