diff --git a/.changelog b/.changelog
index ed660c9395..642cd64583 100644
--- a/.changelog
+++ b/.changelog
@@ -1,20 +1,36 @@
-13.1 (2023-04-10)
+13.2 (2023-06-10)
 ------------------------------------------------------------------------
-Add: [NewGRF] Engine name callback for nested variants. (#10399)
-Fix: Improve main toolbar tooltips (#10616)
-Fix: [NewGRF] Additional validation for Action3 (+others) (#10601)
-Fix: Clear button for editbox didn't take account of padding (#10583)
-Fix: [Script] Access to enum/consts defined outside of main.nut (#10573)
-Fix #10568: Bogus warning when loading a save with a NewGRFs on dedicated servers (#10572)
-Fix #10554: Crash when scrolling in the autoreplace window with collapsed variants (#10555)
-Fix: Network server highlight invisible with RTL languages. (#10551)
-Fix: Client name was not being used as company manager name (#10535)
-Fix: Prevent road vehicles on crossing from crashing into the side of a train (#10496)
-Fix #10477: [macOS] Calculation for window sizes when using custom fonts was being rounded incorrectly (#10489)
-Fix #10486: Crash in debug window when GS started before AIs (#10487)
-Fix #10469: [Script] Negative numbers in League Table window were sorted incorrectly (#10471)
-Fix #10465: Crash on timeout if user never enters a password for server (#10466)
-Fix #10280, #10461: Crash on opening town windows as a spectator (#10462)
-Fix #10059: Script config values stored in the config file could cause crashes (#10444)
+Change: [Win32] position window in center of workspace of primary display (#10942)
+Change: Automatically disable hardware acceleration when GPU driver crashed the game last attempt (#10928)
+Change: [Linux] Default scroll mode to non-mouse-lock (#10920)
+Change: Include font style in font name for Freetype (#10879)
+Fix: Don't restore backed up vehicle name if it's no longer unique (#10979)
+Fix #10975: Train name wrongly marked as unique when joining trains (#10976)
+Fix: Crash when not even a single row fits for dropdowns on low resolution screens (#10934)
+Fix: Crash with tooltip on low resolution screens (#10933)
+Fix: Crash when window can't be placed on low resolution screens (#10932)
+Fix #10502: Apply engine refit before attaching free wagons (#10926)
+Fix: Wayland crash on startup due to Pango also using FontConfig (#10916)
+Fix: When syncing width of GUI items, take padding into account (#10915)
+Fix: Make dropdowns self-close when losing focus (#10912)
+Fix: Land info window maximum width was not scaled (#10894)
+Fix: Check max member count in squirrel classes (#10883)
+Fix: Ask FontConfig for the face index when opening fonts (#10878)
+Fix #10831: Level crossing parts left barred after crossing tile removal (#10874)
+Fix: Rail waypoint selection window not closed when parent windows closed (#10873)
+Fix #10846: [Script] Crash on trying to allocate an excessively large array (#10848)
+Fix: [Win32] Text line breaking did not properly handle punctuation characters (#10775)
+Fix: [Emscripten] Crash when saving games (#10758)
+Fix: [Win32] Wrong multi-line text layout due to incorrect whitespace handling (#10752)
+Fix #10741: Rail platforms left partially reserved after train crash (#10751)
+Fix: Shaded engines in purchase list incorrectly shaded (#10736)
+Fix #10735: [NewGRF] {POP_COLOUR} fails if string is drawn with extra flags (#10736)
+Fix #8177: Ships with max speed overflow to near-zero speed (#10695)
+Fix #10289: Don't silently fail when setting timetable start dates (#10690)
+Fix #8302: Improve "Maintenance intervals are in percents" helptext (#10686)
+Fix #10665: "No vehicles are available yet" message did not appear correctly on non-temperate climates (#10673)
+Fix #10630: Don't allow shifting service date earlier than year 0 (#10643)
+Fix #10637, #10638: Incorrect water infrastructure totals when building certain object types (#10639, #10640)
+Fix: Abort loading savegame if road vehicle is on invalid road type (#10622)
 
 
diff --git a/.ottdrev b/.ottdrev
index 41503e7fdb..979c6d18a8 100644
--- a/.ottdrev
+++ b/.ottdrev
@@ -1 +1 @@
-13.1	20230410	0	7f987c8d3aaa0dc1648d1351f3bcc7188d2be3a7	1	1	2023
+13.2	20230610	0	d4df692a707dcc428e98b11dfe4c2e51c922d661	1	1	2023
diff --git a/.release_date b/.release_date
index 337617bda6..e9cf2b2bda 100644
--- a/.release_date
+++ b/.release_date
@@ -1 +1 @@
-2023-04-10 19:45 UTC
+2023-06-10 13:53 UTC
diff --git a/.version b/.version
index cdb4ac4096..5ba096eb42 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-13.1
+13.2
diff --git a/changelog.txt b/changelog.txt
index 1a287980b5..911e1cda5e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,39 @@
+13.2 (2023-06-10)
+------------------------------------------------------------------------
+Change: [Win32] position window in center of workspace of primary display (#10942)
+Change: Automatically disable hardware acceleration when GPU driver crashed the game last attempt (#10928)
+Change: [Linux] Default scroll mode to non-mouse-lock (#10920)
+Change: Include font style in font name for Freetype (#10879)
+Fix: Don't restore backed up vehicle name if it's no longer unique (#10979)
+Fix #10975: Train name wrongly marked as unique when joining trains (#10976)
+Fix: Crash when not even a single row fits for dropdowns on low resolution screens (#10934)
+Fix: Crash with tooltip on low resolution screens (#10933)
+Fix: Crash when window can't be placed on low resolution screens (#10932)
+Fix #10502: Apply engine refit before attaching free wagons (#10926)
+Fix: Wayland crash on startup due to Pango also using FontConfig (#10916)
+Fix: When syncing width of GUI items, take padding into account (#10915)
+Fix: Make dropdowns self-close when losing focus (#10912)
+Fix: Land info window maximum width was not scaled (#10894)
+Fix: Check max member count in squirrel classes (#10883)
+Fix: Ask FontConfig for the face index when opening fonts (#10878)
+Fix #10831: Level crossing parts left barred after crossing tile removal (#10874)
+Fix: Rail waypoint selection window not closed when parent windows closed (#10873)
+Fix #10846: [Script] Crash on trying to allocate an excessively large array (#10848)
+Fix: [Win32] Text line breaking did not properly handle punctuation characters (#10775)
+Fix: [Emscripten] Crash when saving games (#10758)
+Fix: [Win32] Wrong multi-line text layout due to incorrect whitespace handling (#10752)
+Fix #10741: Rail platforms left partially reserved after train crash (#10751)
+Fix: Shaded engines in purchase list incorrectly shaded (#10736)
+Fix #10735: [NewGRF] {POP_COLOUR} fails if string is drawn with extra flags (#10736)
+Fix #8177: Ships with max speed overflow to near-zero speed (#10695)
+Fix #10289: Don't silently fail when setting timetable start dates (#10690)
+Fix #8302: Improve "Maintenance intervals are in percents" helptext (#10686)
+Fix #10665: "No vehicles are available yet" message did not appear correctly on non-temperate climates (#10673)
+Fix #10630: Don't allow shifting service date earlier than year 0 (#10643)
+Fix #10637, #10638: Incorrect water infrastructure totals when building certain object types (#10639, #10640)
+Fix: Abort loading savegame if road vehicle is on invalid road type (#10622)
+
+
 13.1 (2023-04-10)
 ------------------------------------------------------------------------
 Add: [NewGRF] Engine name callback for nested variants. (#10399)
diff --git a/cmake/CompileFlags.cmake b/cmake/CompileFlags.cmake
index 27d9a48efa..6a942b2160 100644
--- a/cmake/CompileFlags.cmake
+++ b/cmake/CompileFlags.cmake
@@ -136,6 +136,10 @@ macro(compile_flags)
                 # -flifetime-dse=2 (default since GCC 6) doesn't play
                 # well with our custom pool item allocator
                 "$<$<BOOL:${LIFETIME_DSE_FOUND}>:-flifetime-dse=1>"
+
+                # We have a fight between clang wanting std::move() and gcc not wanting it
+                # and of course they both warn when the other compiler is happy
+                "-Wno-redundant-move"
             )
         endif()
 
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 3b8e68f955..cadaf411f3 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -35,7 +35,7 @@ bool IsReleasedVersion()
  *
  * <modified> shows a "M", if the binary is made from modified source code.
  */
-const char _openttd_revision[] = "${REV_VERSION}";
+const char _openttd_revision[] = "13.2";
 
 /**
  * The text version of OpenTTD's build date.
@@ -48,12 +48,12 @@ const char _openttd_build_date[] = __DATE__ " " __TIME__;
 /**
  * The git revision hash of this version.
  */
-const char _openttd_revision_hash[] = "${REV_HASH}";
+const char _openttd_revision_hash[] = "d4df692a707dcc428e98b11dfe4c2e51c922d661";
 
 /**
  * The year of this version.
  */
-const char _openttd_revision_year[] = "${REV_YEAR}";
+const char _openttd_revision_year[] = "2023";
 
 /**
  * Let us know if current build was modified. This detection
@@ -63,21 +63,21 @@ const char _openttd_revision_year[] = "${REV_YEAR}";
  * (compiling from sources without any version control software)
  * and 2 is for modified revision.
  */
-const byte _openttd_revision_modified = ${REV_MODIFIED};
+const byte _openttd_revision_modified = 0;
 
 /**
  * Indicate whether this is a tagged version.
  * If this is non-0, then _openttd_revision is the name of the tag,
  * and the version is likely a beta, release candidate, or real release.
  */
-const byte _openttd_revision_tagged = ${REV_ISTAG};
+const byte _openttd_revision_tagged = 1;
 
 /**
  * To check compatibility of BaNaNaS content, this version string is used.
  * It should never contain things like "beta", but only the release version
  * we are compatible with.
  */
-const char _openttd_content_version[] = "${REV_MAJOR}.${REV_MINOR}";
+const char _openttd_content_version[] = "13.1";
 
 /**
  * The NewGRF revision of OTTD:
@@ -95,4 +95,4 @@ const char _openttd_content_version[] = "${REV_MAJOR}.${REV_MINOR}";
  * the "patch" part of the version. To make sure "1.11.0" is smaller than "12.0", we
  * have to adjust the major by 16.
  */
-const uint32 _openttd_newgrf_version = (${REV_MAJOR} + 16) << 24 | ${REV_MINOR} << 20 | ${REV_ISSTABLETAG} << 19 | 28004;
+const uint32 _openttd_newgrf_version = (13 + 16) << 24 | 1 << 20 | 1 << 19 | 28004;