diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index adfc0cded..1f05c1f13 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,8 @@
-February 23, 2009  (Changes by Graf Zahl)
+February 23, 2009
+- Fixed: player->oldbuttons was copied from the current button set at the end
+  of P_PlayerThink(), well before ACS could ever get at it with GetPlayerInput.
+
+February 23, 2009  (Changes by Graf Zahl)
 - Fixed: The map name display on the automap was incomplete.
 - Added FakeInventory.Respawns DECORATe property
 - Fixed: Unsetting the MF5_INCONVERSATION flag did not work when quitting the
diff --git a/src/g_game.cpp b/src/g_game.cpp
index d78aba115..1273e023e 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -989,6 +989,7 @@ void G_Ticker ()
 			{
 				G_WriteDemoTiccmd (newcmd, i, buf);
 			}
+			players[i].oldbuttons = cmd->ucmd.buttons;
 			// If the user alt-tabbed away, paused gets set to -1. In this case,
 			// we do not want to read more demo commands until paused is no
 			// longer negative.
diff --git a/src/p_user.cpp b/src/p_user.cpp
index b1bf1bfb7..4721ff1fc 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -2313,9 +2313,6 @@ void P_PlayerThink (player_t *player)
 			}
 		}
 	}
-
-	// Save buttons
-	player->oldbuttons = cmd->ucmd.buttons;
 }
 
 void P_PredictPlayer (player_t *player)