diff --git a/includes/filerepo/backend/FSFileBackend.php b/includes/filerepo/backend/FSFileBackend.php
index f6c7d481387..edaf523b425 100644
--- a/includes/filerepo/backend/FSFileBackend.php
+++ b/includes/filerepo/backend/FSFileBackend.php
@@ -456,7 +456,9 @@ class FSFileIterator implements Iterator {
 	public function __construct( $dir ) {
 		$this->suffixStart = strlen( realpath( $dir ) ) + 1; // size of "path/to/dir/"
 		try {
-			$this->iter = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $dir ) );
+			$flags = FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS;
+			$this->iter = new RecursiveIteratorIterator(
+				new RecursiveDirectoryIterator( $dir, $flags ) );
 		} catch ( UnexpectedValueException $e ) {
 			$this->iter = null; // bad permissions? deleted?
 		}