diff --git a/.classpath b/.classpath
index 9dd4578..e45ccef 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/news-feed-2.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/news-feed-2.6.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/news-feed-2.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/news-feed-2.6.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -39,5 +39,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/news-feed-2.6.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/news-feed-2.6.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 86eec8c..147fb00 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,20 +1,26 @@
 <ReleaseNotes>
 	<Changeset component="org.gcube.portlets-user.news-feed.2-6-1"
 		date="2018-04-12">
-		Removed previous jquery js load script and useless deprecated pagebus</Changeset>
+		<Change>Removed previous jquery js load script and useless deprecated
+			pagebus</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.news-feed.2-6-0"
 		date="2018-03-07">
 		<Change>Ported to GWT 2.8.2</Change>
 		<Change>Fix for Incident #11187 citing a people (with '@') in comments
-			is not working anymore</Change>
+			is not working anymore
+		</Change>
 		<Change>
 			Feature #11189: Social-Networking - citing a people (with '@')
 			in comments loses the focus.
 		</Change>
-		<Change>Feature #10192 allow to sort feeds per recent comments</Change>
-		<Change>Bug #7841 lack of blank space to separate the query term when hashtag is used</Change>
+		<Change>Feature #10192 allow to sort feeds per recent comments
+		</Change>
+		<Change>Bug #7841 lack of blank space to separate the query term when
+			hashtag is used</Change>
 		<Change>Support for ticket #11139</Change>
-		<Change>Enhanced efficiency when retrieving mentioned users or groups in comments</Change>
+		<Change>Enhanced efficiency when retrieving mentioned users or groups
+			in comments</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.news-feed.2-5-0"
 		date="2017-11-13">