diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index c42e65903..b87ca3956 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 0.2:
+- Autopilot works in Quasispace when without fuel, from fOSSiL.
 - Negative shift warnings removed, from Fizban
 - Displaying correct lander images, from fOSSiL.
 - 3D planet now uses phong lighting, from PhracturedBlue
diff --git a/sc2/TODO b/sc2/TODO
index 75696e02a..6e87b918d 100644
--- a/sc2/TODO
+++ b/sc2/TODO
@@ -90,7 +90,6 @@ Glitches (don't crash the game, medium priority):
   entries will be wrong.
 - Temp files don't get deleted if the game is exited in full game mode.
   (and the temp dir doesn't get deleted if it's not empty)
-- autopilot does not work in Quasispace when you have no fuel.
 
 Implementation bugs (low priority):
 - Scaling code problems:
diff --git a/sc2/src/sc2code/ships/sis_ship/sis_ship.c b/sc2/src/sc2code/ships/sis_ship/sis_ship.c
index 05039b172..f2c6f3315 100644
--- a/sc2/src/sc2code/ships/sis_ship/sis_ship.c
+++ b/sc2/src/sc2code/ships/sis_ship/sis_ship.c
@@ -198,7 +198,8 @@ LeaveAutoPilot:
 				&ElementPtr->velocity,
 				&dx, &dy
 				);
-		if (GLOBAL_SIS (FuelOnBoard)
+		if ((GLOBAL_SIS (FuelOnBoard)
+				|| GET_GAME_STATE (ARILOU_SPACE_SIDE) > 1)
 				&& (int)facing == (int)StarShipPtr->ShipFacing)
 		{
 			StarShipPtr->cur_status_flags |= SHIP_AT_MAX_SPEED;