diff --git a/src/main/java/org/gcube/informationsystem/utils/documentation/model/Documentation.java b/src/main/java/org/gcube/informationsystem/utils/documentation/model/Documentation.java
index 8166837..5014895 100644
--- a/src/main/java/org/gcube/informationsystem/utils/documentation/model/Documentation.java
+++ b/src/main/java/org/gcube/informationsystem/utils/documentation/model/Documentation.java
@@ -1,7 +1,10 @@
 package org.gcube.informationsystem.utils.documentation.model;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -392,21 +395,30 @@ public abstract class Documentation {
 		stringBuffer.append(type.getVersionAsString());
 		stringBuffer.append(".\n\n");
 		Map<String, String> changelog = type.getChangelogWithVersionAsString();
-		Set<String> keySet = changelog.keySet();
+		List<String> versions = new ArrayList<>(changelog.keySet());
+		versions.sort(new Comparator<String>() {
+
+			@Override
+			public int compare(String o1, String o2) {
+				return o2.compareTo(o1);
+			}
+			
+		});
 		stringBuffer.append("Changelog:\n\n");
 		int i=0;
-		for(String version : keySet) {
+		for(String version : versions) {
 			stringBuffer.append("* **");
 			stringBuffer.append(version);
 			stringBuffer.append("**: ");
 			stringBuffer.append(changelog.get(version));
-			if(i==keySet.size()-1) {
+			if(i==versions.size()-1) {
 				stringBuffer.append(".");
 			}else {
 				stringBuffer.append(";");
 			}
+			stringBuffer.append("\n");
 		}
-		stringBuffer.append("\n\n");
+		stringBuffer.append("\n");
 		return stringBuffer;
 	}