diff --git a/lib/vagrant.rb b/lib/vagrant.rb
index e607e7d24..b5d61585c 100644
--- a/lib/vagrant.rb
+++ b/lib/vagrant.rb
@@ -178,6 +178,7 @@ Vagrant.guests.register(:freebsd) { Vagrant::Guest::FreeBSD }
 Vagrant.guests.register(:gentoo)  { Vagrant::Guest::Gentoo }
 Vagrant.guests.register(:linux)   { Vagrant::Guest::Linux }
 Vagrant.guests.register(:redhat)  { Vagrant::Guest::Redhat }
+Vagrant.guests.register(:fedora)  { Vagrant::Guest::Fedora }
 Vagrant.guests.register(:solaris) { Vagrant::Guest::Solaris }
 Vagrant.guests.register(:suse)    { Vagrant::Guest::Suse }
 Vagrant.guests.register(:ubuntu)  { Vagrant::Guest::Ubuntu }
diff --git a/lib/vagrant/guest.rb b/lib/vagrant/guest.rb
index b92385ba2..8bb80ec2d 100644
--- a/lib/vagrant/guest.rb
+++ b/lib/vagrant/guest.rb
@@ -9,6 +9,7 @@ module Vagrant
     autoload :Gentoo,  'vagrant/guest/gentoo'
     autoload :Linux,   'vagrant/guest/linux'
     autoload :Redhat,  'vagrant/guest/redhat'
+    autoload :Fedora,  'vagrant/guest/fedora'
     autoload :Solaris, 'vagrant/guest/solaris'
     autoload :Suse,    'vagrant/guest/suse'
     autoload :Ubuntu,  'vagrant/guest/ubuntu'
diff --git a/lib/vagrant/guest/fedora.rb b/lib/vagrant/guest/fedora.rb
new file mode 100644
index 000000000..ce06162f7
--- /dev/null
+++ b/lib/vagrant/guest/fedora.rb
@@ -0,0 +1,66 @@
+require 'set'
+require 'tempfile'
+
+require 'vagrant/util/template_renderer'
+
+module Vagrant
+  module Guest
+    class Fedora < Linux
+      # Make the TemplateRenderer top-level
+      include Vagrant::Util
+
+      def configure_networks(networks)
+        # Accumulate the configurations to add to the interfaces file as well
+        # as what interfaces we're actually configuring since we use that later.
+        interfaces = Set.new
+        networks.each do |network|
+          interfaces.add(network[:interface])
+
+          # Remove any previous vagrant configuration in this network
+          # interface's configuration files.
+          vm.channel.sudo("touch #{network_scripts_dir}/ifcfg-p7p#{network[:interface]}")
+          vm.channel.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-p7p#{network[:interface]} > /tmp/vagrant-ifcfg-p7p#{network[:interface]}")
+          vm.channel.sudo("cat /tmp/vagrant-ifcfg-p7p#{network[:interface]} > #{network_scripts_dir}/ifcfg-p7p#{network[:interface]}")
+
+          # Render and upload the network entry file to a deterministic
+          # temporary location.
+          entry = TemplateRenderer.render("guests/fedora/network_#{network[:type]}",
+                                          :options => network)
+
+          temp = Tempfile.new("vagrant")
+          temp.binmode
+          temp.write(entry)
+          temp.close
+
+          vm.channel.upload(temp.path, "/tmp/vagrant-network-entry_#{network[:interface]}")
+        end
+
+        # Bring down all the interfaces we're reconfiguring. By bringing down
+        # each specifically, we avoid reconfiguring p7p (the NAT interface) so
+        # SSH never dies.
+        interfaces.each do |interface|
+          vm.channel.sudo("/sbin/ifdown p7p#{interface} 2> /dev/null", :error_check => false)
+          vm.channel.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-p7p#{interface}")
+          vm.channel.sudo("/sbin/ifup p7p#{interface} 2> /dev/null")
+        end
+      end
+
+      # The path to the directory with the network configuration scripts.
+      # This is pulled out into its own directory since there are other
+      # operating systems (SuSE) which behave similarly but with a different
+      # path to the network scripts.
+      def network_scripts_dir
+        '/etc/sysconfig/network-scripts'
+      end
+
+      def change_host_name(name)
+        # Only do this if the hostname is not already set
+        if !vm.channel.test("sudo hostname | grep '#{name}'")
+          vm.channel.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network")
+          vm.channel.sudo("hostname #{name}")
+          vm.channel.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+        end
+      end
+    end
+  end
+end
diff --git a/lib/vagrant/guest/linux.rb b/lib/vagrant/guest/linux.rb
index a0dd0b7c1..e94af2db0 100644
--- a/lib/vagrant/guest/linux.rb
+++ b/lib/vagrant/guest/linux.rb
@@ -19,6 +19,7 @@ module Vagrant
         end
 
         return :gentoo if @vm.channel.test("cat /etc/gentoo-release")
+        return :fedora if @vm.channel.test("grep 'Fedora release 16' /etc/redhat-release")
         return :redhat if @vm.channel.test("cat /etc/redhat-release")
         return :suse if @vm.channel.test("cat /etc/SuSE-release")
         return :arch if @vm.channel.test("cat /etc/arch-release")
diff --git a/templates/guests/fedora/network_dhcp.erb b/templates/guests/fedora/network_dhcp.erb
new file mode 100644
index 000000000..70a5c5dc9
--- /dev/null
+++ b/templates/guests/fedora/network_dhcp.erb
@@ -0,0 +1,6 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+BOOTPROTO=dhcp
+ONBOOT=yes
+DEVICE=p7p<%= options[:interface] %>
+#VAGRANT-END
diff --git a/templates/guests/fedora/network_static.erb b/templates/guests/fedora/network_static.erb
new file mode 100644
index 000000000..aa7e20d5d
--- /dev/null
+++ b/templates/guests/fedora/network_static.erb
@@ -0,0 +1,13 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+NM_CONTROLLED=no
+BOOTPROTO=static
+ONBOOT=yes
+IPADDR=<%= options[:ip] %>
+NETMASK=<%= options[:netmask] %>
+DEVICE=p7p<%= options[:interface] %>
+<%= options[:gateway] ? "GATEWAY=#{options[:gateway]}" : '' %>
+<%= options[:mac_address] ? "HWADDR=#{options[:mac_address]}" : '' %>
+<%= options[:dns1] ? "DNS1=#{options[:dns1]}" : 'DNS1=8.8.4.4' %>
+<%= options[:dns2] ? "DNS2=#{options[:dns2]}" : 'DNS1=8.8.8.8' %>
+#VAGRANT-END