--- a/src/openttd.cpp	Tue Dec 11 03:41:33 2007 +0000
+++ b/src/openttd.cpp	Tue Dec 11 17:44:55 2007 +0000
@@ -2254,6 +2254,16 @@
 		}
 	}
 
+	/* Update go to buoy orders because they are just waypoints */
+	if (CheckSavegameVersion(84)) {
+		Order *order;
+		FOR_ALL_ORDERS(order) {
+			if (order->type == OT_GOTO_STATION && GetStation(order->dest)->IsBuoy()) {
+				order->flags = 0;
+			}
+		}
+	}
+
 	return InitializeWindowsAndCaches();
 }
 

--- a/src/order_cmd.cpp	Tue Dec 11 03:41:33 2007 +0000
+++ b/src/order_cmd.cpp	Tue Dec 11 17:44:55 2007 +0000
@@ -676,7 +676,7 @@
 	if (sel_ord >= v->num_orders) return CMD_ERROR;
 
 	order = GetVehicleOrder(v, sel_ord);
-	if (order->type != OT_GOTO_STATION &&
+	if ((order->type != OT_GOTO_STATION  || GetStation(order->dest)->IsBuoy()) &&
 			(order->type != OT_GOTO_DEPOT    || p2 == OFB_UNLOAD) &&
 			(order->type != OT_GOTO_WAYPOINT || p2 != OFB_NON_STOP)) {
 		return CMD_ERROR;

--- a/src/order_gui.cpp	Tue Dec 11 03:41:33 2007 +0000
+++ b/src/order_gui.cpp	Tue Dec 11 17:44:55 2007 +0000
@@ -152,7 +152,15 @@
 
 	if (order != NULL) {
 		switch (order->type) {
-			case OT_GOTO_STATION: break;
+			case OT_GOTO_STATION:
+				if (!GetStation(order->dest)->IsBuoy()) break;
+				/* Fall-through */
+
+			case OT_GOTO_WAYPOINT:
+				w->DisableWidget(ORDER_WIDGET_FULL_LOAD);
+				w->DisableWidget(ORDER_WIDGET_UNLOAD);
+				w->DisableWidget(ORDER_WIDGET_TRANSFER);
+				break;
 
 			case OT_GOTO_DEPOT:
 				w->DisableWidget(ORDER_WIDGET_TRANSFER);
@@ -163,12 +171,6 @@
 				SetDParam(2,STR_SERVICE);
 				break;
 
-			case OT_GOTO_WAYPOINT:
-				w->DisableWidget(ORDER_WIDGET_FULL_LOAD);
-				w->DisableWidget(ORDER_WIDGET_UNLOAD);
-				w->DisableWidget(ORDER_WIDGET_TRANSFER);
-				break;
-
 			default: // every other orders
 				w->DisableWidget(ORDER_WIDGET_NON_STOP);
 				w->DisableWidget(ORDER_WIDGET_FULL_LOAD);