diff --git a/lisp/tramp-sh.el b/lisp/tramp-sh.el
index b7089207..08f05630 100644
--- a/lisp/tramp-sh.el
+++ b/lisp/tramp-sh.el
@@ -4207,6 +4207,13 @@ process to set up.  VEC specifies the connection."
       (tramp-cleanup-connection vec t t)
       (throw 'uname-changed (tramp-maybe-open-connection vec)))

+    ;; stat on Solaris is buggy.  We've got reports for "SunOS 5.10"
+    ;; and "SunOS 5.11" so far.
+    (when (string-match-p
+	   (eval-when-compile (regexp-opt '("SunOS 5.10" "SunOS 5.11")))
+	   (tramp-get-connection-property vec "uname" ""))
+      (tramp-set-connection-property vec "stat" nil))
+
     ;; Try to set up the coding system correctly.
     ;; CCC this can't be the right way to do it.  Hm.
     (tramp-message vec 5 "Determining coding system")