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 084931e..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,5 +0,0 @@
-Maintainers
----------------------------------------
-
-* Francesco Mangiacrapa (francesco.mangiacrapa@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 351154a..3678c90 100644
--- a/distro/README
+++ b/distro/README
@@ -1,40 +1,60 @@
-The gCube System - GisViewer
-------------------------------------------------------------
-
-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.
-
-Authors
--------
-
-* Francesco Mangiacrapa (francesco.mangiacrapa@isti.cnr.it), CNR Pisa,
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-
-
+The gCube System - ${name}
+--------------------------------------------------
+
+${description}
+
+
+${gcube.description}
+
+${gcube.funding}
+
+
Version
-------------------------
-
-v. 1.1.0
-
-Description
+--------------------------------------------------
+
+${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
-----------
-A library with several utility classes to work with geo-spatial data: WmsUrlValidator, GeoGetStyles, etc.
-
+
+* 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.d4science-ii.research-infrastructures.eu/gcube/trunk/spatial-data/geo-utility
-
-Binaries can be downloaded from:
-http://www.gcube-system.org/index.php
+--------------------------------------------------
+
+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/About_gCube
-
+--------------------------------------------------
+
+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.
+--------------------------------------------------
+
+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 d55da79..657e76c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,8 @@
geo-utility
jar
1.1.0-SNAPSHOT
- A library with several utility classes to work with geo-spatial data: WmsUrlValidator, GeoGetStyles, etc..
+ geo-utility
+ A library with several utility classes to work with geo-spatial data: WmsUrlValidator, GeoGetStyles, etc..
distro
@@ -48,11 +49,11 @@
1.2
-
-
-
-
-
+
+
+
+
+
org.json