diff --git simcity.cc simcity.cc
index 0bda10129..b48758413 100644
--- simcity.cc
+++ simcity.cc
@@ -2952,6 +2952,9 @@ int stadt_t::orient_city_building(const koord k, const building_desc_t *h, koord
 				if(  max_layout > 3  &&  ((largest_2nd_dir-largest_dir)==1  ||  (largest_2nd_dir-largest_dir)==3)  ) {
 					// corner cases: only roads on two sides
 					if(  streetdir[0]<0  &&  streetdir[1]<0  ) {
+						rotation = 6;
+					}
+					else if(  streetdir[1]<0  &&  streetdir[2]<0  ) {
 						rotation = 7;
 					}
 					else if(  streetdir[2]<0  &&  streetdir[3]<0  ) {
@@ -2960,9 +2963,6 @@ int stadt_t::orient_city_building(const koord k, const building_desc_t *h, koord
 					else if(  streetdir[3]<0  &&  streetdir[0]<0  ) {
 						rotation = 5;
 					}
-					else if(  streetdir[0]<0  &&  streetdir[1]<0  ) {
-						rotation = 6;
-					}
 					// some valid found?
 					if(  rotation >=0  &&  h->get_x(rotation) <= maxarea.x  &&  h->get_y(rotation) <= maxarea.y  ) {
 						return rotation;
diff --git simutrans/history.txt simutrans/history.txt
index f386b1f05..1505577ca 100644
--- simutrans/history.txt
+++ simutrans/history.txt
@@ -1,3 +1,4 @@
+	FIX: Rotation of multi-tile buildings at street corners
 	ADD: different volumes for different sounds, realistic distance scaling (independent from screen size)
 	CHG: Fade sounds with one over square root distance, and remove the dependency from display and tile size
 	ADD: Depot list as dialog tool 32