diff --git a/core/modules/file/config/schema/file.destination.schema.yml b/core/modules/file/config/schema/file.destination.schema.yml
index 5d494f7013f2244ee3bcf8a5ffe2c3785b8b43ac..c6b197ffe56a6e09c4e68d8dbbb2d9f802fdf23e 100644
--- a/core/modules/file/config/schema/file.destination.schema.yml
+++ b/core/modules/file/config/schema/file.destination.schema.yml
@@ -5,3 +5,6 @@ migrate.destination.entity:file:
     source_path_property:
       type: string
       label: 'Source path'
+    urlencode:
+      type: boolean
+      label: 'Whether to urlencode incoming file paths'
diff --git a/core/modules/file/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml
index 07a9cc2d360fcc3282e23b46e2f5995692837ae0..a4693cf1120a547963b3c509205488e0815f9c33 100644
--- a/core/modules/file/migration_templates/d6_file.yml
+++ b/core/modules/file/migration_templates/d6_file.yml
@@ -23,3 +23,4 @@ process:
   uid: uid
 destination:
   plugin: entity:file
+  urlencode: true
diff --git a/core/modules/file/migration_templates/d7_file.yml b/core/modules/file/migration_templates/d7_file.yml
index ea8f647f11d3e52c0ef66a34b06f8795894dcdfe..b10cca6144078e2e9253698cf8f8dd870a0320eb 100644
--- a/core/modules/file/migration_templates/d7_file.yml
+++ b/core/modules/file/migration_templates/d7_file.yml
@@ -23,3 +23,4 @@ process:
 destination:
   plugin: entity:file
   source_path_property: filepath
+  urlencode: true