diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index 28c3ef6..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-* Configure
-nothing to be done
-
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index ac810c2..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-* CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
\ No newline at end of file
diff --git a/distro/README b/distro/README
index 3299d0f..35c99c0 100644
--- a/distro/README
+++ b/distro/README
@@ -1,37 +1,67 @@
-The gCube System - Portlets - 
-------------------------------------------------------------
-
-This work is partially funded by the European Commission in the
-context of the D4Science project (www.d4science.eu), under the 1st call of FP7 IST priority.
-
+The gCube System - ${name}
+--------------------------------------------------
+ 
+${description}
+ 
+ 
+${gcube.description}
+ 
+${gcube.funding}
+ 
+ 
+Version
+--------------------------------------------------
+ 
+${version} (${buildDate})
+ 
+Please see the file named "changelog.xml" in this directory for the release notes.
+ 
+ 
 Authors
--------
-Massimiliano Assante		
-* 
-Version and Release Date
-------------------------
-October 2010
+--------------------------------------------------
+ 
+* Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
 
-
-Description
+ 
+ 
+Maintainers
 -----------
-Shared Custom portal Handler LIbrary
-
+ 
+* 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:
-yes look for it :)
-
-Binaries can be downloaded from:
-http://software.d4science.research-infrastructures.eu/
-
+--------------------------------------------------
+ 
+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 from the Projects Documentation Wiki:
-
-https://gcube.wiki.gcube-system.org/gcube/index.php/Developing_gCube_Portlets_Guide#Set_the_Portlet_Context_.28How_to_get_the_logged_in_user.27s_information.29
-
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/
+    ${gcube.wikiRoot}/
+ 
+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. 
+--------------------------------------------------
+ 
+This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
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