diff --git a/changelog.txt b/changelog.txt
index e039ca8f02..d1fd8ceead 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+0.6.3 (2008-10-01)
+------------------------------------------------------------------------
+- Fix: NewGRF VarAction 2 variable 43 for industries saw MP_VOID tiles as land tiles and was inefficient (r14417, r14416, r14415)
+- Fix: Possible buffer overrun/wrong parameter type passed to printf (r14414, r14397)
+- Fix: Generation seed set using -G was always overwritten by -g (r14408)
+- Fix: Do not allow extending signals by dragging in any direction other than the track direction [FS#2202] (r14013)
+
+
 0.6.3-RC1 (2008-09-22)
 ------------------------------------------------------------------------
 - Fix: Invalid v->u.air.targetairport could cause crashes at several places [FS#2300] (r14383, r14344, r14343)
diff --git a/known-bugs.txt b/known-bugs.txt
index 526f59ce7c..cc382c3bf7 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -11,7 +11,7 @@ by the number below on http://bugs.openttd.org.
 If the bug report is closed, it has been fixed, which then can be verified
 in the latest SVN version of /trunk.
 
-Bugs for 0.6.3-RC1
+Bugs for 0.6.3
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org
 
diff --git a/os/debian/changelog b/os/debian/changelog
index e6dc54758d..478f3dda7e 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
+openttd (0.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Remko Bijker <rubidium@openttd.org>  Wed, 01 Oct 2008 18:48:05 +0200
+
 openttd (0.6.3~rc1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index b5d4269aef..f5bee365a4 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -1,10 +1,10 @@
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "0.6.3"  ; Define application version
-!define INSTALLERVERSION 52 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 53 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 !include ${VERSION_INCLUDE}
 
 !define APPURLLINK "http://www.openttd.org"
-!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}-RC1"
+!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
 !define APPVERSIONINTERNAL "${APPVERSION}.0" ; Needs to be of the format X.X.X.X
 
 !define MUI_ICON "..\..\..\media\openttd.ico"
diff --git a/readme.txt b/readme.txt
index e240e5f91b..faace0c882 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2008-09-22
-Release version: 0.6.3-RC1
+Last updated:    2008-10-01
+Release version: 0.6.3
 ------------------------------------------------------------------------
 
 
diff --git a/src/stdafx.h b/src/stdafx.h
index b237b30f08..e615d075dd 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -278,7 +278,7 @@ typedef unsigned char byte;
 #if defined(__OS2__)
 	#define assert_compile(expr)
 #else
-	#define assert_compile(expr) extern "C" void __ct_assert__(int a[1 - 2 * !(expr)])
+	#define assert_compile(expr) extern const int __ct_assert__[1 - 2 * !(expr)]
 #endif /* __OS2__ */
 
 /* Check if the types have the bitsizes like we are using them */