--- lisp/tramp.el	2010-02-26 18:54:51.803291169 +1000
+++ /tmp/tramp-2.1.17/lisp/tramp.el	2009-11-08 08:11:29.000000000 +1000
@@ -3428,8 +3428,6 @@
 (defun tramp-handle-rename-file
   (filename newname &optional ok-if-already-exists)
   "Like `rename-file' for Tramp files."
-  (tramp-message v 4 "tramp-handle-rename-file old:%s new:%s" filename newname)
-
   ;; Check if both files are local -- invoke normal rename-file.
   ;; Otherwise, use Tramp from local system.
   (setq filename (expand-file-name filename))
@@ -3579,8 +3577,8 @@
 	(file-times (nth 5 (file-attributes filename)))
 	(file-modes (tramp-default-file-modes filename)))
     (with-parsed-tramp-file-name (if t1 filename newname) nil
-      (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "ferriscp -f -p")
-			((eq op 'copy) "ferriscp -f")
+      (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -p")
+			((eq op 'copy) "cp -f")
 			((eq op 'rename) "mv -f")
 			(t (tramp-error
 			    v 'file-error
@@ -3699,7 +3697,7 @@
 		       (zerop
 			(tramp-send-command-and-check
 			 v (format
-			    "ferriscp -f -p %s %s"
+			    "cp -f -p %s %s"
 			    (tramp-shell-quote-argument tmpfile)
 			    (tramp-shell-quote-argument localname2))))
 		       (tramp-error-with-buffer
@@ -4520,10 +4518,7 @@
 	      (tramp-message v 5 "Encoding remote file %s..." filename)
 	      (tramp-barf-unless-okay
 	       v
-	       (format "fcat %s | %s" 
-		       (tramp-shell-quote-argument localname)
-		       rem-enc 
-		       )
+	       (format "%s < %s" rem-enc (tramp-shell-quote-argument localname))
 	       "Encoding remote file failed")
 	      (tramp-message v 5 "Encoding remote file %s...done" filename)
 
@@ -4995,8 +4990,7 @@
 		  (tramp-send-command
 		   v
 		   (format
-;		    "%s > %s <<'EOF'\n%sEOF"
-		    "shovetofile() { cat - | %s | ferris-redirect --trunc %s; }\n shovetofile <<'EOF'\n%sEOF"
+		    "%s >%s <<'EOF'\n%sEOF"
 		    rem-dec
 		    (tramp-shell-quote-argument localname)
 		    (buffer-string)))
@@ -7910,7 +7904,7 @@
     (tramp-message vec 5 "Finding a suitable `ls' command")
     (or
      (catch 'ls-found
-       (dolist (cmd '("ferrisls" "ls" "gnuls" "gls"))
+       (dolist (cmd '("ls" "gnuls" "gls"))
 	 (let ((dl (tramp-get-remote-path vec))
 	       result)
 	   (while (and dl (setq result (tramp-find-executable vec cmd dl t t)))
@@ -7931,9 +7925,9 @@
 (defun tramp-get-test-command (vec)
   (with-connection-property vec "test"
     (tramp-message vec 5 "Finding a suitable `test' command")
-    (if (zerop (tramp-send-command-and-check vec "ftest 0"))
-	"ftest"
-      (tramp-find-executable vec "ftest" (tramp-get-remote-path vec)))))
+    (if (zerop (tramp-send-command-and-check vec "test 0"))
+	"test"
+      (tramp-find-executable vec "test" (tramp-get-remote-path vec)))))
 
 (defun tramp-get-test-nt-command (vec)
   ;; Does `test A -nt B' work?  Use abominable `find' construct if it
@@ -7989,7 +7983,7 @@
   (with-connection-property vec "stat"
     (tramp-message vec 5 "Finding a suitable `stat' command")
     (let ((result (tramp-find-executable
-		   vec "fstat" (tramp-get-remote-path vec)))
+		   vec "stat" (tramp-get-remote-path vec)))
 	  tmp)
       ;; Check whether stat(1) returns usable syntax.  %s does not
       ;; work on older AIX systems.
@@ -8005,7 +7999,7 @@
 		     (string-match "^./.$" (car tmp))
 		     (integerp (cadr tmp)))
 	  (setq result nil)))
-      (concat result " --fuzz"))))
+      result)))
 
 (defun tramp-get-remote-readlink (vec)
   (with-connection-property vec "readlink"