diff --git a/deployment/puppet/cobbler/manifests/server.pp b/deployment/puppet/cobbler/manifests/server.pp
index a7f4f22554..bdb1ae73ab 100644
--- a/deployment/puppet/cobbler/manifests/server.pp
+++ b/deployment/puppet/cobbler/manifests/server.pp
@@ -147,7 +147,7 @@ class cobbler::server (
           '/var/lib/fuel/keys',
           '/var/lib/fuel/keys/master',
           '/var/lib/fuel/keys/master/cobbler',
-         ]:
+          ]:
     ensure => 'directory',
   }
   file { '/etc/httpd/conf.d/nailgun.conf':
@@ -199,6 +199,15 @@ class cobbler::server (
     notify  => Service[$cobbler_web_service],
   }
 
+  file { '/etc/httpd/conf.d/cobbler-tftp.conf':
+    content => template('cobbler/cobbler-tftp.conf.erb'),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    require => File['/etc/httpd/conf.d/'],
+    notify  => Service[$cobbler_web_service],
+  }
+
   service { $cobbler_web_service:
     ensure     => running,
     enable     => true,
diff --git a/deployment/puppet/cobbler/templates/cobbler-tftp.conf.erb b/deployment/puppet/cobbler/templates/cobbler-tftp.conf.erb
new file mode 100644
index 0000000000..76c371dc1d
--- /dev/null
+++ b/deployment/puppet/cobbler/templates/cobbler-tftp.conf.erb
@@ -0,0 +1,8 @@
+Alias /cobbler/boot /var/lib/tftpboot
+
+<Directory /var/lib/tftpboot>
+  Options +Indexes +FollowSymLinks
+  AllowOverride None
+  Order allow,deny
+  Allow from all
+</Directory>
diff --git a/deployment/puppet/nailgun/templates/dnsmasq.dhcp-range.erb b/deployment/puppet/nailgun/templates/dnsmasq.dhcp-range.erb
index 1282268fc8..2992c2e7b7 100644
--- a/deployment/puppet/nailgun/templates/dnsmasq.dhcp-range.erb
+++ b/deployment/puppet/nailgun/templates/dnsmasq.dhcp-range.erb
@@ -2,3 +2,4 @@
 dhcp-range=<%= @range_name %>,<%= @dhcp_start_address %>,<%= @dhcp_end_address %>,<%= @dhcp_netmask %>,<%= @lease_time %>
 dhcp-option=net:<%= @range_name %>,option:router,<%= @dhcp_gateway %>
 dhcp-boot=net:<%= @range_name %>,pxelinux.0,boothost,<%= @next_server %>
+dhcp-option-force=210,http://<%= @next_server %>/cobbler/boot/