diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index e69de29..0000000
diff --git a/distro/LICENSE b/distro/LICENSE
index 630ba97..3695e26 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,6 +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}
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index 5f8cf02..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-Lucio lelii (lucio.lelii@isti.cnr.it), 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 bb663c7..16bf3ff 100644
--- a/distro/README
+++ b/distro/README
@@ -1,40 +1,65 @@
-The gCube System - Having engine
-------------------------------------------------------------
-
-This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2),
-D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2),
-and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil).
-
-
+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
--------
+--------------------------------------------------
-* Federico De Faveri (federico.defaveri@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
-
-Version and Release Date
-------------------------
+* Federico De Faveri (federico.defaveri-AT-isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
-v. 1.0.0 (19-04-2013)
- * First release
+Maintainers
+--------------------------------------------------
-Description
------------
-Having engine
-
+* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
+* Valentina Marioli (valentina.marioli-AT-isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
Download information
---------------------
-https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/having-engine
-
-
+--------------------------------------------------
+
+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
--------------
-https://gcube.wiki.gcube-system.org/gcube/index.php
-
-
+--------------------------------------------------
+
+Documentation is available on-line in the gCube Wiki:
+ ${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.
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index 21d8c88..ae939d3 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,8 +15,6 @@
READMELICENSE
- INSTALL
- MAINTAINERSchangelog.xml755
@@ -33,10 +31,5 @@
/${artifactId}
-
-
- /${artifactId}
- true
-
-
\ No newline at end of file
+
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index cb50fdf..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/having-engine
\ No newline at end of file