diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d48d8704eb..b5c99652907 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-25  Lute Kamstra  <lute@gnu.org>
+
+	* replace.el (query-replace-read-from): Fix 2005-02-19 change.
+
 2005-02-24  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* frame.el (blink-cursor-mode): Add :group keyword.
diff --git a/lisp/replace.el b/lisp/replace.el
index 2c60cd006f1..d2a0370f93e 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1,7 +1,7 @@
 ;;; replace.el --- replace commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, 2002,
-;;   2003, 2004  Free Software Foundation, Inc.
+;;   2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -116,10 +116,10 @@ wants to replace FROM with TO."
 	       nil t t))))
       (if (and (zerop (length from)) lastto lastfrom)
 	  (progn
-	    (cons lastfrom
-		  (query-replace-compile-replacement lastto regexp-flag))
 	    (set query-replace-from-history-variable
-		 (cdr (symbol-value query-replace-from-history-variable))))
+		 (cdr (symbol-value query-replace-from-history-variable)))
+	    (cons lastfrom
+		  (query-replace-compile-replacement lastto regexp-flag)))
 	;; Warn if user types \n or \t, but don't reject the input.
 	(and regexp-flag
 	     (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from)