diff --git a/CHANGELOG.md b/CHANGELOG.md
index bde9ebdb..d4e30700 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ https://github.com/capistrano/capistrano/compare/v3.5.0...HEAD
   * Make name of current directory configurable via configuration variable `:current_directory` (@websi)
   * `doctor` no longer erroneously warns that `:git_strategy` and other SCM options are "unrecognized" (@shanesaww)
   * Add `net-ssh` gem version to `doctor:gems` output (@lebedev-yury)
+  * Deprecate `remote_file` feature (will be removed in Capistrano 3.7.0) (@lebedev-yury)
 
 ## `3.5.0`
 
diff --git a/lib/capistrano/dsl/task_enhancements.rb b/lib/capistrano/dsl/task_enhancements.rb
index 4c4f5be8..9a217311 100644
--- a/lib/capistrano/dsl/task_enhancements.rb
+++ b/lib/capistrano/dsl/task_enhancements.rb
@@ -18,6 +18,9 @@ module Capistrano
     end
 
     def remote_file(task)
+      warn("[Deprecation Warning] `remote_file` is deprecated and will be "\
+           "removed in Capistrano 3.7.0")
+
       target_roles = task.delete(:roles) { :all }
       define_remote_file_task(task, target_roles)
     end