6 files changed, 106 insertions, 90 deletions
diff --git a/changelog.txt b/changelog.txt
index c11010938..89b3babf8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,68 @@
+1.6.1 (2016-07-01)
+------------------------------------------------------------------------
+- Fix: Compilation and optimisation issues with GCC6 (r27606, r27605, r27595)
+- Fix: Compilation with --disable-network [FS#6481] (r27602)
+- Fix: [NewGRF] shift-and-add-divide/modulo varadjusts use signed division/modulo (r27600)
+- Fix: Company 0 could accept engine previews before they were offered (r27598)
+
+
+1.6.1-RC1 (2016-06-01)
+------------------------------------------------------------------------
+- Feature: Mexican Spanish (r27564, r27553, r27552)
+- Change: Performance improvement for dedicated servers by skipping drawing calls earlier in the process [FS#6402] (r27579)
+- Fix: Automatic servicing of road vehicles compared path finder costs with tile distances, thus vehicles went to depots which were factor 100 too far away [FS#6410] (r27586)
+- Fix: Enforce a non-zero load amount for all vehicles, so that vehicles can process their cargo reservations [FS#6437] (r27585, r27584)
+- Fix: Do not decrease the column width of depot windows when vehicles with high unitnumbers leave [FS#6415] (r27583)
+- Fix: Button size computation in script configuration window [FS#6461] (r27581)
+- Fix: [NewGRF] Set date of last service on construction also for wagons and articulated parts [FS#6395] (r27580)
+- Fix: Vehicles could not be hidden from the purchase list when they were in exclusive preview [FS#6454] (r27578)
+- Fix: Dock and roadstop picker, client list and town authority window did not auto-resize according to their content when they were positioned at the bottom of the screen [FS#6386] (r27577)
+- Fix: Various incorrect but uncritical size computations in the content client [FS#6449] (r27576, r27570)
+- Fix: Memory leak when disabling palette animation [FS#6404] (r27575)
+- Fix: [NewGRF] The house id as returned by house variable 66 was incorrect when querying neighboured tiles [FS#6432] (r27574)
+- Fix: [Build] Compilation failure with gcc 6.1 due to headers included after safeguards.h [FS#6467] (r27573)
+- Fix: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames [FS#6442] (r27572)
+- Fix: [Build] Force sorting to be locale independent, so files are always ordered the same and by that token better diff-able (r27562, r27558)
+- Fix: Typos in comments and string (r27561, r27560)
+- Fix: [Build] bashism that caused different CFLAGS with bash vs dash (r27557)
+- Fix: Use a more appropiate sound effect for convert-rail (r27547)
+- Fix: Remove SetFill from vehicle GUI buttons, so that the viewport is resized instead of them in case of long window titles (r27546)
+- Fix: [Script] Generation of API wrappers (r27545, r27544, r27543)
+- Fix: [Windows] ICU got disabled for Windows builds, breaking RTL support [FS#6427] (r27542)
+- Fix: [NewGRF] Station spritelayouts did not accept the var10 flag for the palette [FS#6435] (r27534)
+
+
+1.6.0 (2016-04-01)
+------------------------------------------------------------------------
+(None)
+
+
+1.6.0-RC1 (2016-03-01)
+------------------------------------------------------------------------
+- Feature: [NewGRF] Allow custom sound IDs in RV property 0x12, ship property 0x10 and aircraft property 0x12 (r27507)
+- Feature: When viewing online content of a particular type, hide content of other types unless they have been (auto)selected for download (r27469, r27468, r27444)
+- Feature: [NewGRF] Move sprite 8 positions in sprite aligner with ctrl+click [FS#6241] (r27451)
+- Feature: Lower the sell-vehicle and sell-chain buttons in the train depot GUI while dragging a vehicle over it [FS#6391] (r27450, r27446)
+- Feature: Make the object placement GUI an independent window (r27438, r27397, r27346)
+- Feature: [Build] Project files and compilation with MSVC2015 (r27385, r27382, r27381, r27380, r27379)
+- Feature: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side [FS#6315] (r27354, r27343)
+- Feature: [NewGRF] Increase the maximum amount of industry types to 128 per NewGRF and 240 in total (r27279)
+- Feature: Make Ctrl+Remove-Roadstop also remove the road, just like for rail stations [FS#6252] (r27251)
+- Change: [NewGRF] Allow static NewGRF to enable the second rocky tile set (r27497)
+- Change: Round loading percentage in loading indicators and conditional orders towards 50%, so that 0% and 100% mean completely empty or full (r27426)
+- Change: [Build] Rework the configure system to make more use of pkg-config (r27377:r27366, r27361, r27360)
+- Change: Enable YAPF cache debugging with desync debug level 2 (r27332)
+- Change: [strgen] Default plural subparameter position for CARGO_xxx string control codes is subparameter 1 (r27295)
+- Change: [NewGRF] Translate industry variable A6 (r27267)
+- Change: Do not consider cargo that is already being loaded as waiting cargo wrt. the station rating [FS#6165] (r27256)
+- Change: Tune down terrain generation to reduce amount of long slopes (r27230)
+- Change: Generate more detailed curves at the coast (r27229)
+- Change: Slightly more water in the non-custom sea levels (r27228)
+- Change: Be more lenient about road stop removal when at least one stop could be removed [FS#6262] (r27225)
+- Fix: [Win32] Stdin/out/err need to be re-assigned differently if the runtime lib of MSVC2015 is used (r27481)
+- Fix: [Haiku] On Haiku use the appropriate system variable to obtain the include dir [FS#6401] (r27472)
+
+
 1.5.3 (2015-12-01)
 ------------------------------------------------------------------------
 (None)
diff --git a/known-bugs.txt b/known-bugs.txt
index 34aca3300..f5ae73101 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2015-02-24
-Release version: 1.5.0-beta2
+Last updated:    2016-07-01
+Release version: 1.6.1
 ------------------------------------------------------------------------
 
 
diff --git a/os/debian/changelog b/os/debian/changelog
index 4dd5b1155..c8cf30794 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,27 @@
+openttd (1.6.1-0) unstable; urgency=low
+
+  * New upstream release 1.6.1
+
+ -- OpenTTD <info@openttd.org>  Fri, 01 Jul 2016 00:00:00 +0200
+
+openttd (1.6.1~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.6.1-RC1
+
+ -- OpenTTD <info@openttd.org>  Wed, 01 Jun 2016 21:00:00 +0200
+
+openttd (1.6.0-0) unstable; urgency=low
+
+  * New upstream release 1.6.0
+
+ -- OpenTTD <info@openttd.org>  Fri, 01 Apr 2016 21:00:00 +0200
+
+openttd (1.6.0~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.6.0-RC1
+
+ -- OpenTTD <info@openttd.org>  Tue, 01 Mar 2016 21:00:00 +0100
+
 openttd (1.5.3-0) unstable; urgency=low
 
   * New upstream release 1.5.3
diff --git a/readme.txt b/readme.txt
index 817f397b5..e378bd5d2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
-Last updated:    2015-02-24
-Release version: 1.5.0-beta2
+Last updated:    2016-07-01
+Release version: 1.6.1
 ------------------------------------------------------------------------
 
 
diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp
index 2d0fe01f8..23f4a0958 100644
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -19,19 +19,11 @@
  *
  * 1.7.0 is not yet released. The following changes are not set in stone yet.
  *
- * \b 1.6.0
+ * \b 1.6.1 - 1.6.0
  *
  * No changes
  *
- * \b 1.5.3
- *
- * No changes
- *
- * \b 1.5.2
- *
- * No changes
- *
- * \b 1.5.1
+ * \b 1.5.3 - 1.5.1
  *
  * No changes
  *
@@ -53,20 +45,7 @@
  * \li AIStationList_CargoWaitingFromByVia
  * \li AIStationList_CargoWaitingViaByFrom
  *
- * \b 1.4.4
- *
- * No changes
- *
- * \b 1.4.3
- *
- * No changes
- *
- * \b 1.4.2
- *
- * No changes
- *
- * \b 1.4.1
- *
+ * \b 1.4.4 - 1.4.1
  * No changes
  *
  * \b 1.4.0
@@ -87,11 +66,7 @@
  * \li AIStation::GetCargoRating does return -1 for cargo-station combinations that
  *     do not have a rating yet instead of returning 69.
  *
- * \b 1.3.3
- *
- * No changes
- *
- * \b 1.3.2
+ * \b 1.3.3 - 1.3.2
  *
  * No changes
  *
@@ -110,15 +85,7 @@
  * \li AIStation::OpenCloseAirport
  * \li AIController::Break
  *
- * \b 1.2.3
- *
- * No changes
- *
- * \b 1.2.2
- *
- * No changes
- *
- * \b 1.2.1
+ * \b 1.2.3 - 1.2.1
  *
  * No changes
  *
@@ -185,15 +152,7 @@
  * API additions:
  * \li AIVehicle::ERR_VEHICLE_TOO_LONG in case vehicle length limit is reached.
  *
- * \b 1.1.3
- *
- * No changes
- *
- * \b 1.1.2
- *
- * No changes
- *
- * \b 1.1.1
+ * \b 1.1.3 - 1.1.1
  *
  * No changes
  *
@@ -224,11 +183,7 @@
  * \li AIRoad::BuildDriveThroughRoadStation now allows overbuilding.
  * \li AIRoad::BuildRoadStation now allows overbuilding.
  *
- * \b 1.0.5
- *
- * No changes
- *
- * \b 1.0.4
+ * \b 1.0.5 - 1.0.4
  *
  * No changes
  *
@@ -342,11 +297,7 @@
  *     station orders for buoys one has to use waypoint orders.
  * \li Autoreplaces can now also be set for the default group via AIGroup.
  *
- * \b 0.7.5
- *
- * No changes
- *
- * \b 0.7.4
+ * \b 0.7.5 - 0.7.4
  *
  * No changes
  *
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp
index 182ca79af..a9e7b0b30 100644
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -19,19 +19,11 @@
  *
  * 1.7.0 is not yet released. The following changes are not set in stone yet.
  *
- * \b 1.6.0
+ * \b 1.6.1 - 1.6.0
  *
  * No changes
  *
- * \b 1.5.3
- *
- * No changes
- *
- * \b 1.5.2
- *
- * No changes
- *
- * \b 1.5.1
+ * \b 1.5.3 - 1.5.1
  *
  * No changes
  *
@@ -58,11 +50,7 @@
  *     industry, or town. The user can click at the news message to jump to the
  *     referred location.
  *
- * \b 1.4.4
- *
- * No changes
- *
- * \b 1.4.3
+ * \b 1.4.4 - 1.4.3
  *
  * No changes
  *
@@ -106,11 +94,7 @@
  * \li GSStation::GetCargoRating does return -1 for cargo-station combinations that
  *     do not have a rating yet instead of returning 69.
  *
- * \b 1.3.3
- *
- * No changes
- *
- * \b 1.3.2
+ * \b 1.3.3 - 1.3.2
  *
  * No changes
  *
@@ -136,15 +120,7 @@
  * Other changes:
  * \li Company specific goals are now removed when a company goes bankrupt or is taken over.
  *
- * \b 1.2.3
- *
- * No changes
- *
- * \b 1.2.2
- *
- * No changes
- *
- * \b 1.2.1
+ * \b 1.2.3 - 1.2.1
  *
  * No changes
  *