diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5983cc20..6e007f1ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,8 @@ BUG FIXES:
   - hosts/arch: NFS works with latest versions. [GH-4224]
   - hosts/windows: RDP command works without crash. [GH-3962]
   - providers/docker: Port on its own will choose random host port. [GH-3991]
+  - providers/docker: The proxy VM Vagrantfile can be in the same directory
+      as the main Vagrantfile. [GH-4065]
   - providers/virtualbox: Increase network device limit to 36. [GH-4206]
   - providers/virtualbox: Error if can't detect VM name. [GH-4047]
   - provisioners/chef: Chef client cleanup should work. [GH-4099]
diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index 667447297..9d2c0d15c 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -146,7 +146,10 @@ module Vagrant
       @logger.info("Calling action: #{name} on provider #{@provider}")
 
       # Create a deterministic ID for this machine
-      id = Digest::MD5.hexdigest("#{@env.root_path}#{@name}")
+      vf = nil
+      vf = @env.vagrantfile_name[0] if @env.vagrantfile_name
+      id = Digest::MD5.hexdigest(
+        "#{@env.root_path}#{vf}#{@name}")
 
       # We only lock if we're not executing an SSH action. In the future
       # we will want to do more fine-grained unlocking in actions themselves