diff --git a/src/k_kart.c b/src/k_kart.c
index 7074fe42a..e6c066939 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3215,14 +3215,14 @@ void K_TumblePlayer(player_t *player, mobj_t *inflictor, mobj_t *source)
 
 static boolean K_LastTumbleBounceCondition(player_t *player)
 {
-	return (player->tumbleBounces > TUMBLEBOUNCES && player->tumbleHeight < 40);
+	return (player->tumbleBounces > TUMBLEBOUNCES && player->tumbleHeight < 60);
 }
 
 static void K_HandleTumbleBounce(player_t *player)
 {
 	fixed_t gravityadjust;
 	player->tumbleBounces++;
-	player->tumbleHeight = (player->tumbleHeight * 4) / 5;
+	player->tumbleHeight = (player->tumbleHeight * ((player->tumbleHeight > 100) ? 3 : 4)) / 5;
 	player->pflags &= ~PF_TUMBLESOUND;
 
 	if (player->tumbleHeight < 10)
diff --git a/src/k_respawn.c b/src/k_respawn.c
index fcce1b632..f09358dcc 100644
--- a/src/k_respawn.c
+++ b/src/k_respawn.c
@@ -155,9 +155,12 @@ void K_DoIngameRespawn(player_t *player)
 	// If player was tumbling, set variables so that they don't tumble like crazy after they're done respawning
 	if (player->tumbleBounces > 0)
 	{
-		player->tumbleBounces = TUMBLEBOUNCES-1; // Max # of bounces-1 (so you still tumble once)
-		player->pflags &= ~PF_TUMBLELASTBOUNCE; // Still force them to bounce at least once for the funny
-		players->tumbleHeight = 20; // force tumble height
+		player->tumbleBounces = 0; // MAXBOUNCES-1;
+		player->pflags &= ~PF_TUMBLELASTBOUNCE;
+		//players->tumbleHeight = 20;
+		players->mo->rollangle = 0;
+		player->spinouttype = KSPIN_WIPEOUT;
+		player->spinouttimer = player->wipeoutslow = (3*TICRATE/2)+2;
 	}
 
 	P_ResetPlayer(player);