--- a/src/newgrf.cpp	Tue Mar 20 02:24:14 2007 +0000
+++ b/src/newgrf.cpp	Tue Mar 20 10:06:39 2007 +0000
@@ -1256,6 +1256,7 @@
 				housespec[i]->enabled = true;
 				housespec[i]->local_id = hid + i;
 				housespec[i]->substitute_id = subs_id;
+				housespec[i]->grffile = _cur_grffile;
 				housespec[i]->random_colour[0] = 0x04;  // those 4 random colours are the base colour
 				housespec[i]->random_colour[1] = 0x08;  // for all new houses
 				housespec[i]->random_colour[2] = 0x0C;  // they stand for red, blue, orange and green
@@ -2316,7 +2317,6 @@
 			}
 
 			hs->spritegroup = _cur_grffile->spritegroups[groupid];
-			hs->grffile = _cur_grffile;
 		}
 		return;
 	}

--- a/src/town_cmd.cpp	Tue Mar 20 02:24:14 2007 +0000
+++ b/src/town_cmd.cpp	Tue Mar 20 10:06:39 2007 +0000
@@ -127,8 +127,15 @@
 	HouseID house_id = GetHouseType(ti->tile);
 
 	if (house_id >= NEW_HOUSE_OFFSET) {
-		DrawNewHouseTile(ti, house_id);
-		return;
+		/* Houses don't necessarily need new graphics. If they don't have a
+		 * spritegroup associated with them, then the sprite for the substitute
+		 * house id is drawn instead. */
+		if (GetHouseSpecs(house_id)->spritegroup != NULL) {
+			DrawNewHouseTile(ti, house_id);
+			return;
+		} else {
+			house_id = GetHouseSpecs(house_id)->substitute_id;
+		}
 	}
 
 	/* Retrieve pointer to the draw town tile struct */