diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 7d5b9e993..50d5d027b 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,6 @@
 Changes towards version 0.3:
+- Planet spin on lander launch/return is now enabled -PhracturedBlue
+- Fix skipping after planet scan, landing (closes bug 31) -PhracturedBlue
 - Decelerate when entering orbit to give a smoother effect -PhracturedBlue
 - fix subtitle text overlap issues (bug 232)
 - 'Esc' now leaves planet surface (bug233) -PhracturedBlue
diff --git a/sc2/src/sc2code/planets/lander.c b/sc2/src/sc2code/planets/lander.c
index 8c494eb3e..b087e1663 100644
--- a/sc2/src/sc2code/planets/lander.c
+++ b/sc2/src/sc2code/planets/lander.c
@@ -23,7 +23,7 @@
 
 //define SPIN_ON_LAUNCH to let the planet spin while
 // the lander animation is playing
-#undef SPIN_ON_LAUNCH
+#define SPIN_ON_LAUNCH
 
 // PLANET_SIDE_RATE governs how fast the lander,
 // bio and planet effects will be
diff --git a/sc2/src/sc2code/planets/plangen.c b/sc2/src/sc2code/planets/plangen.c
index 59df51efb..9c8eee912 100644
--- a/sc2/src/sc2code/planets/plangen.c
+++ b/sc2/src/sc2code/planets/plangen.c
@@ -1436,7 +1436,9 @@ rotate_planet_task (void *data)
 					++pSS->MenuState.Initialized;
 				}
 				x += i;
-			}
+			} else
+				view_index++;
+
 			ClearSemaphore (GraphicsSem);
 			// If this frame hasn't been generted, generate it
 			if (! pSolarSysState->isPFADefined[x]) {