diff --git a/plugins/guests/debian/cap/change_host_name.rb b/plugins/guests/debian/cap/change_host_name.rb
index 21b95fec5..d62297c97 100644
--- a/plugins/guests/debian/cap/change_host_name.rb
+++ b/plugins/guests/debian/cap/change_host_name.rb
@@ -1,4 +1,5 @@
 require "log4r"
+require 'vagrant/util/guest_hosts'
 require_relative "../../linux/cap/network_interfaces"
 
 module VagrantPlugins
@@ -7,6 +8,7 @@ module VagrantPlugins
       class ChangeHostName
 
         extend Vagrant::Util::GuestInspection::Linux
+        extend Vagrant::Util::GuestHosts::Linux
 
         def self.change_host_name(machine, name)
           @logger = Log4r::Logger.new("vagrant::guest::debian::changehostname")
@@ -18,15 +20,6 @@ module VagrantPlugins
               # Set the hostname
               echo '#{basename}' > /etc/hostname
 
-              # Prepend ourselves to /etc/hosts
-              grep -w '#{name}' /etc/hosts || {
-                if grep -w '^127\\.0\\.1\\.1' /etc/hosts ; then
-                  sed -i'' 's/^127\\.0\\.1\\.1\\s.*$/127.0.1.1\\t#{name}\\t#{basename}/' /etc/hosts
-                else
-                  sed -i'' '1i 127.0.1.1\\t#{name}\\t#{basename}' /etc/hosts
-                fi
-              }
-
               # Update mailname
               echo '#{name}' > /etc/mailname
 
@@ -65,6 +58,13 @@ module VagrantPlugins
               restart_each_interface(machine, @logger)
             end
           end
+
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, name, network_with_hostname[:ip])
+          else
+            add_hostname_to_loopback_interface(comm, name)
+          end
         end
 
         protected
diff --git a/test/unit/plugins/guests/debian/cap/change_host_name_test.rb b/test/unit/plugins/guests/debian/cap/change_host_name_test.rb
index 1c05625d5..77e1a51be 100644
--- a/test/unit/plugins/guests/debian/cap/change_host_name_test.rb
+++ b/test/unit/plugins/guests/debian/cap/change_host_name_test.rb
@@ -26,18 +26,56 @@ describe "VagrantPlugins::GuestDebian::Cap::ChangeHostName" do
     let(:hostnamectl) { true }
     let(:networkd) { true }
     let(:network_manager) { false }
+    let(:networks) { [
+      [:forwarded_port, {:guest=>22, :host=>2222, :host_ip=>"127.0.0.1", :id=>"ssh", :auto_correct=>true, :protocol=>"tcp"}]
+    ] }
 
     before do
       allow(cap).to receive(:systemd?).and_return(systemd)
       allow(cap).to receive(:hostnamectl?).and_return(hostnamectl)
       allow(cap).to receive(:systemd_networkd?).and_return(networkd)
       allow(cap).to receive(:systemd_controlled?).with(anything, /NetworkManager/).and_return(network_manager)
+      allow(machine).to receive_message_chain(:config, :vm, :networks).and_return(networks)
     end
 
-    it "sets the hostname if not set" do
-      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
-      cap.change_host_name(machine, name)
-      expect(comm.received_commands[1]).to match(/echo 'banana-rama' > \/etc\/hostname/)
+    context "minimal network config" do
+      it "sets the hostname if not set" do
+        comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
+        cap.change_host_name(machine, name)
+        expect(comm.received_commands[1]).to match(/echo 'banana-rama' > \/etc\/hostname/)
+      end
+
+      it "sets the hostname if not set" do
+        comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 0)
+        cap.change_host_name(machine, name)
+        expect(comm.received_commands[1]).to_not match(/echo 'banana-rama' > \/etc\/hostname/)
+      end
+    end
+
+    context "multiple networks configured with hostname" do 
+      it "adds a new entry only for the hostname" do 
+        networks = [
+          [:forwarded_port, {:guest=>22, :host=>2222, :host_ip=>"127.0.0.1", :id=>"ssh", :auto_correct=>true, :protocol=>"tcp"}],
+          [:public_network, {:ip=>"192.168.0.1", :hostname=>true, :protocol=>"tcp", :id=>"93a4ad88-0774-4127-a161-ceb715ff372f"}],
+          [:public_network, {:ip=>"192.168.0.2", :protocol=>"tcp", :id=>"5aebe848-7d85-4425-8911-c2003d924120"}]
+        ]
+        allow(machine).to receive_message_chain(:config, :vm, :networks).and_return(networks)
+        expect(cap).to receive(:replace_host)
+        expect(cap).to_not receive(:add_hostname_to_loopback_interface)
+        cap.change_host_name(machine, name)
+      end
+
+      it "appends an entry to the loopback interface" do 
+        networks = [
+          [:forwarded_port, {:guest=>22, :host=>2222, :host_ip=>"127.0.0.1", :id=>"ssh", :auto_correct=>true, :protocol=>"tcp"}],
+          [:public_network, {:ip=>"192.168.0.1", :protocol=>"tcp", :id=>"93a4ad88-0774-4127-a161-ceb715ff372f"}],
+          [:public_network, {:ip=>"192.168.0.2", :protocol=>"tcp", :id=>"5aebe848-7d85-4425-8911-c2003d924120"}]
+        ]
+        allow(machine).to receive_message_chain(:config, :vm, :networks).and_return(networks)
+        expect(cap).to_not receive(:replace_host)
+        expect(cap).to receive(:add_hostname_to_loopback_interface).once
+        cap.change_host_name(machine, name)
+      end
     end
 
     context "when hostnamectl is in use" do
@@ -116,7 +154,7 @@ describe "VagrantPlugins::GuestDebian::Cap::ChangeHostName" do
     it "does not set the hostname if unset" do
       comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 0)
       cap.change_host_name(machine, name)
-      expect(comm.received_commands.size).to eq(1)
+      expect(comm.received_commands.size).to eq(2)
     end
   end