diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index 9ffa442..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-Used as service in the gCube Framework
\ No newline at end of file
diff --git a/distro/LICENSE b/distro/LICENSE
index 630ba97..cdf50bd 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,6 +1,4 @@
 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 84395c3..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Lucio lelii (lucio.lelii@isti.cnr.it), CNR Pisa, 
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
diff --git a/distro/README b/distro/README
index 4dbb0be..a61347f 100644
--- a/distro/README
+++ b/distro/README
@@ -1,45 +1,66 @@
-The gCube System - tabular data service
-
-------------------------------------------------------------
-
-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), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1). 
-
-
+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
--------
-
-* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-  
-  
-Version and Release Date
-------------------------
-
-v. 1.0.0 
-        * First release
-    
-        
-Description
+--------------------------------------------------
+ 
+* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, Italy
+ 
+ 
+Maintainers
 -----------
-
-  
-  
-  Download information
---------------------
-
-
-
+ 
+* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, 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}
+ 
+ 
+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/descriptor.xml b/distro/descriptor.xml
index 7ee3a28..e395580 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -9,15 +9,14 @@
 	<baseDirectory>/</baseDirectory>
 	<fileSets>
 		<fileSet>
-			<directory>/home/lucio/workspace/imarine/tabular-data-service/distro</directory>
+			<directory>${distroDirectory}</directory>
 			<outputDirectory>/</outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<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>
@@ -25,13 +24,9 @@
 	</fileSets>
 	<files>
 		<file>
-			<source>target/tabular-data-manager.war</source>
-			<outputDirectory>/tabular-data-manager</outputDirectory>
-		</file>
-		<file>
-			<source>/home/lucio/workspace/imarine/tabular-data-service/distro/svnpath.txt</source>
-			<outputDirectory>/tabular-data-manager</outputDirectory>
-			<filtered>true</filtered>
+			<source>target/${build.finalName}.${project.packaging}</source>
+			<outputDirectory>/${artifactId}</outputDirectory>
 		</file>
+
 	</files>
 </assembly>
\ No newline at end of file
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/pom.xml b/pom.xml
index c58db0a..6e865ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,15 +280,6 @@
 					<target>1.7</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<warName>tabular-data-manager</warName>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>