diff -u openttd-0.6.0/debian/changelog openttd-0.6.0/debian/changelog
--- openttd-0.6.0/debian/changelog
+++ openttd-0.6.0/debian/changelog
@@ -1,3 +1,10 @@
+openttd (0.6.0-2+ubuntu1) stable; urgency=low
+
+  * Backport upstream r18462 to fix remote crash vulnerability
+    CVE-2009-4007.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 23 Dec 2009 23:08:48 +0100
+
 openttd (0.6.0-2) unstable; urgency=low
 
   [ Jordi Mallach ]
only in patch2:
unchanged:
--- openttd-0.6.0.orig/src/train_cmd.cpp
+++ openttd-0.6.0/src/train_cmd.cpp
@@ -921,10 +921,6 @@
  */
 static void NormaliseTrainConsist(Vehicle *v)
 {
-	if (IsFreeWagon(v)) return;
-
-	assert(IsFrontEngine(v));
-
 	for (; v != NULL; v = GetNextVehicle(v)) {
 		if (!IsMultiheaded(v) || !IsTrainEngine(v)) continue;