diff --git a/changelog.txt b/changelog.txt
index 6b6c7f0b5e..afe483563b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+1.3.3 (2013-11-29)
+------------------------------------------------------------------------
+- Fix: Aircraft crashing near the map's border due to a lack of airports could trigger a crash [CVE-2013-6411] [FS#5820] (r26134)
+
+
 1.3.3-RC2 (2013-11-24)
 ------------------------------------------------------------------------
 - Fix: [Script] Prevent scripts from crashing OpenTTD when they send text with command codes to user editable texts such as sign and station names [FS#5818] (r26093, r26092)
diff --git a/known-bugs.txt b/known-bugs.txt
index f10a6f7c7c..2b57b9b925 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2013-11-24
-Release version: 1.3.3-RC2
+Last updated:    2013-11-29
+Release version: 1.3.3
 ------------------------------------------------------------------------
 
 
diff --git a/os/debian/changelog b/os/debian/changelog
index cb4af7b498..cd394a6321 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
+openttd (1.3.3-0) unstable; urgency=low
+
+  * New upstream release 1.3.3
+
+ -- OpenTTD <info@openttd.org>  Fri, 29 Nov 2013 19:00:00 +0100
+
 openttd (1.3.3~RC2-0) unstable; urgency=low
 
   * New upstream release 1.3.3-RC2
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index aaaacd0f7b..b699532e59 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.3.3-RC2
+set OPENTTD_VERSION=1.3.3
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index 792d86e6b0..ea3a12675d 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 3
 !define APPV_MAINT 3
-!define APPV_BUILD 1
-!define APPV_EXTRA "-RC2"
+!define APPV_BUILD 2
+!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 0773ae31d3..9c1e4a5016 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
-Last updated:    2013-11-24
-Release version: 1.3.3-RC2
+Last updated:    2013-11-29
+Release version: 1.3.3
 ------------------------------------------------------------------------
 
 
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index f4bf03e9a8..05795605ea 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -1021,7 +1021,7 @@ static bool HandleCrashedAircraft(Aircraft *v)
 
 	/* make aircraft crash down to the ground */
 	if (v->crashed_counter < 500 && st == NULL && ((v->crashed_counter % 3) == 0) ) {
-		int z = GetSlopePixelZ(v->x_pos, v->y_pos);
+		int z = GetSlopePixelZ(Clamp(v->x_pos, 0, MapMaxX() * TILE_SIZE), Clamp(v->y_pos, 0, MapMaxY() * TILE_SIZE));
 		v->z_pos -= 1;
 		if (v->z_pos == z) {
 			v->crashed_counter = 500;