diff --git a/code/filesys.lisp b/code/filesys.lisp
index dcf47dab021f0b3ab7a7750fac206298ae93725b..dadb0ee55705e51562ac527e6a2ec7abe361f7ea 100644
--- a/code/filesys.lisp
+++ b/code/filesys.lisp
@@ -6,7 +6,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.104 2007/09/10 16:25:00 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.105 2008/06/18 15:57:01 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -929,7 +929,7 @@
   file, then the associated file is renamed."
   (let* ((original (truename file))
 	 (original-namestring (unix-namestring original t))
-	 (new-name (merge-pathnames new-name original))
+	 (new-name (merge-pathnames new-name file))
 	 (new-namestring (unix-namestring new-name nil)))
     (unless new-namestring
       (error 'simple-file-error
diff --git a/general-info/release-19f.txt b/general-info/release-19f.txt
index 893215cfd383231c065db85103491632250c1544..ebbbab5bff6e734d7082ba338d09538264439be6 100644
--- a/general-info/release-19f.txt
+++ b/general-info/release-19f.txt
@@ -28,6 +28,12 @@ New in this release:
     - Fix merging of version in MAKE-PATHNAME.  If the pathname name
       is given, the version is not affected by the version in the
       default pathname.
+    - RENAME-FILE now creates defaulted-new-name from merging new-name
+      with the original filespec.  This is an incompatible change from
+      the previous version which created defaulted-new-name from
+      merging the new-name with the truename of filespec.  Also, a
+      logical pathname should be returned if new-name is a logical
+      pathname. 
 
   * Bugfixes:
     - Compiler can now derive the rank of an array, even if the array