diff --git a/cobbler/conf/tftpd.template b/cobbler/conf/tftpd.template
new file mode 100644
index 0000000..31f4d36
--- /dev/null
+++ b/cobbler/conf/tftpd.template
@@ -0,0 +1,21 @@
+# default: off
+# description: The tftp server serves files using the trivial file transfer \
+#       protocol.  The tftp protocol is often used to boot diskless \
+#       workstations, download configuration files to network-aware printers, \
+#       and to start the installation process for some operating systems.
+service tftp
+{
+        disable                 = no
+        log_type                = SYSLOG local5 info
+        socket_type             = dgram
+        protocol                = udp
+        wait                    = yes
+        user                    = $user
+        server                  = $binary
+        server_args             = -B 1380 -v -s $args
+        instances		= 1000
+        per_source              = 1000
+        cps                     = 1000 2
+        flags                   = IPv4
+}
+
diff --git a/cobbler/snippets/partition_disks b/cobbler/snippets/partition_disks
index 0f80a5e..0f51eaa 100644
--- a/cobbler/snippets/partition_disks
+++ b/cobbler/snippets/partition_disks
@@ -42,7 +42,7 @@ echo "ignoredisk --only-use=$partitions_only" >> /tmp/part-include
 #end if
 
 echo "part /boot --fstype ext3 --size=100 --ondisk=\${disks[0]}  --asprimary" >> /tmp/part-include
-echo "part swap --recommended --ondisk=\${disks[0]}" >> /tmp/part-include
+echo "part swap --recommended --maxsize=128000 --ondisk=\${disks[0]}" >> /tmp/part-include
 
 vggroup=''
 let disk_offset=0