diff --git a/distro/LICENSE b/distro/LICENSE
index 630ba97..c9a783e 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}
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
index ba9c41c..c081ab4 100644
--- a/distro/MAINTAINERS
+++ b/distro/MAINTAINERS
@@ -1,2 +1,3 @@
-Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa, 
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
\ No newline at end of file
+- 	Luca Frosini (luca.frosini-AT-isti.cnr.it), 
+	Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, 
+	Pisa (Italy).
\ No newline at end of file
diff --git a/distro/changelog.xml b/distro/changelog.xml
index d8a74e8..344aab9 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,5 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <ReleaseNotes>
-	<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.2-0-0" date="2016-XX-XX">
+	<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.2-1-0" date="${buildDate}">
+		<Change>Fixed distro files</Change>
+	</Changeset>
+	<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.2-0-0" date="2016-12-15">
 		<Change>Environment variable values replaced instead of just appended in ~/.bashrc (refs #2179)</Change>
 	</Changeset>
 	<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.1-0-6" date="2016-02-15">
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index 5eb4bb4..756c22c 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -1,7 +1,5 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
 	<id>bundle</id>
 	<formats>
 		<format>tar.gz</format>