diff --git a/changelog.txt b/changelog.txt
index e3f0b2b478..957e25af8f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,12 @@
+1.1.4 (2011-12-05)
+------------------------------------------------------------------------
+- Fix: Savegames made with the Catalan town name generator would trigger a 'savegame corrupt' exception [FS#4866] (r23418)
+- Fix: [Network] Do not send chat messages to clients that have not joined yet [FS#4826] (r23337)
+- Fix: Assertion could be triggered in case a station was removed just after a vehicle delivered cargo to it [FS#4849] (r23312)
+- Fix: Pathfinders go haywire when you build a lock over a ship going perpendicular to the axis of the new lock [FS#4845] (r23284)
+- Fix: [NewGRF] Prevent against writing data for unknown fonts (r23283)
+
+
 1.1.4-RC1 (2011-11-20)
 ------------------------------------------------------------------------
 - Fix: 3-column view of NewGRF GUI had too much space for certain font sizes (r23251)
diff --git a/known-bugs.txt b/known-bugs.txt
index baad34864d..4191a8c6a5 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2011-11-20
-Release version: 1.1.4-RC1
+Last updated:    2011-12-05
+Release version: 1.1.4
 ------------------------------------------------------------------------
 
 
diff --git a/os/debian/changelog b/os/debian/changelog
index a997d05f00..7711ca59fb 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
+openttd (1.1.4) unstable; urgency=low
+
+  * New upstream release 1.1.4
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 05 Dec 2011 00:00:00 +0400
+
 openttd (1.1.4-RC1) unstable; urgency=low
 
   * New upstream release 1.1.4-RC1
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index 7cce7f8b14..d5dd0ac548 100644
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.1.4-RC1
+set OPENTTD_VERSION=1.1.4
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=0.7.0
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index 8b96ea23f6..d143c7646e 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 1
 !define APPV_MAINT 4
-!define APPV_BUILD 0
-!define APPV_EXTRA "-RC1"
+!define APPV_BUILD 1
+!define APPV_EXTRA ""
 
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
diff --git a/readme.txt b/readme.txt
index ee440a8d4a..cf0bfd2962 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2011-11-20
-Release version: 1.1.4-RC1
+Last updated:    2011-12-05
+Release version: 1.1.4
 ------------------------------------------------------------------------
 
 
diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp
index 970cc5bd4e..8cc73d8fbe 100644
--- a/src/saveload/town_sl.cpp
+++ b/src/saveload/town_sl.cpp
@@ -205,7 +205,7 @@ static void Load_TOWN()
 		Town *t = new (index) Town();
 		SlObject(t, _town_desc);
 
-		if (t->townnamegrfid == 0 && !IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST)) {
+		if (t->townnamegrfid == 0 && !IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST + 1)) {
 			SlErrorCorrupt("Invalid town name generator");
 		}
 	}