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 c2a3625..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,3 +0,0 @@
-
-* Andrea Manzi (andrea.manzi@cern.ch), CERN 
-  
\ No newline at end of file
diff --git a/distro/README b/distro/README
index 8faba1b..01ae06f 100644
--- a/distro/README
+++ b/distro/README
@@ -1,44 +1,62 @@
-The gCube System - GHNManager Service Client
-------------------------------------------------------------
-
-
-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), i
-Marine (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
--------
-
-* Andrea Manzi (andrea.manzi@cern.ch), CERN 
-
-
-Version and Release Date
-------------------------
+--------------------------------------------------
+* Andrea Manzi (andrea.manzi-AT-cern.ch), CERN 
 
-v. 1.0, 04/05/2012
 
-Description
+Maintainers
 -----------
-
-
+ 
+* Andrea Manzi (andrea.manzi-AT-cern.ch), CERN
+ 
 Download information
---------------------
-
-Source code is available from SVN:
-http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vre-management/GHNManager
-
-Binaries can be downloaded from:
-http://www.gcube-system.org/
+--------------------------------------------------
+ 
+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/GHN_Manager
-
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/GHN_Manager
+
+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 6152aa2..8845987 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -14,9 +14,8 @@
 			<includes>
 				<include>README</include>
 				<include>LICENSE</include>
-				<include>INSTALL</include>
-				<include>MAINTAINERS</include>
 				<include>changelog.xml</include>
+                                <include>profile.xml</include>
 			</includes>
 			<fileMode>755</fileMode>
 			<filtered>true</filtered>
@@ -29,19 +28,9 @@
 		</fileSet>
 	</fileSets>
 	<files>
-		<file>
-			<source>${distroDirectory}/profile.xml</source>
-			<outputDirectory>./</outputDirectory>
-			<filtered>true</filtered>
-		</file>
 		<file>
 			<source>target/${build.finalName}.jar</source>
 			<outputDirectory>/${artifactId}</outputDirectory>
 		</file>
-		<file>
-			<source>${distroDirectory}/svnpath.txt</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-			<filtered>true</filtered>
-		</file>
 	</files>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index f416f9d..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-${scm.url}