diff --git a/build.gradle b/build.gradle
index 398c3fef89..3c9c270e85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,8 @@ allprojects {
     version = '1.0.1'
     ext {
         appName = "Unciv"
-        appCodeNumber = 398
-        appVersion = "3.6.10"
+        appCodeNumber = 399
+        appVersion = "3.6.11"
 
         gdxVersion = '1.9.10'
         roboVMVersion = '2.3.1'
diff --git a/changelog.md b/changelog.md
index 2a52a198ee..14506104bf 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,21 @@
+## 3.6.11
+
+By rh-github-2015:
+ - More civilopedia info for nations and improvements - 
+ - Better error handling for Mods
+
+Fixed "other civ doesn't get duration on timed trades" bug
+
+Removed "Declare war" trade option when there's a peace treaty
+
+Resolved #2175 - Can no longer queue multiple perpetual builds
+
+Resolved #2150 - Added resource type to civilopedia description
+
+Resolved #2224 - can no longer enter promotions screen from overview screen if no valid promotions
+
+LOADS of Translation updates
+
 ## 3.6.10
 
 By Jack Rainy: