diff --git a/lisp/tramp-adb.el b/lisp/tramp-adb.el
index 1fe10a56..65bb2e0c 100644
--- a/lisp/tramp-adb.el
+++ b/lisp/tramp-adb.el
@@ -329,6 +329,11 @@ arguments to pass to the OPERATION."
 			   (tramp-compat-file-name-concat localname "."))
 			  (tramp-shell-quote-argument
 			   (tramp-compat-file-name-concat localname ".."))))
+	       (replace-regexp-in-region
+		(regexp-quote
+		 (tramp-compat-file-name-unquote
+		  (file-name-as-directory localname)))
+		"" (point-min))
 	       (widen)))
 	   (tramp-adb-sh-fix-ls-output)
 	   (let ((result (tramp-do-parse-file-attributes-with-ls
@@ -382,6 +387,10 @@ arguments to pass to the OPERATION."
 Android's \"ls\" command doesn't insert size column for directories:
 Emacs dired can't find files."
   (save-excursion
+    ;; Fix file names with spaces.
+    ;; FIXME: It would be better if we could call "ls" with proper
+    ;; argument or environment variable.
+    (replace-string-in-region "\\ " " " (point-min))
     ;; Insert missing size.
     (goto-char (point-min))
     (while