diff --git a/distro/changelog.xml b/distro/changelog.xml
index 6c46cac..d8a74e8 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,13 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.2-0-0" date="2016-XX-XX">
+		<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">
+		<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-5" date="2016-02-01">
+		<Change>Improved setup (refs #77)</Change>
+	</Changeset>
 	<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.1-0-4" date="2015-10-16">
 		<Change>Passing smartgears-distribution version as argument when compiling</Change>
 		<Change>Used tomcat 7 range instead of fixed version</Change>
diff --git a/src/resources/stopContainer.sh b/src/resources/stopContainer.sh
index 7b5c742..fe82cb9 100755
--- a/src/resources/stopContainer.sh
+++ b/src/resources/stopContainer.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 cd $BUNDLE_HOME
-$CATALINA_HOME/bin/shutdown.sh
+# Waiting 30 seconds for sane termination
+$CATALINA_HOME/bin/shutdown.sh 30