diff --git a/cobbler/action_buildiso.py b/cobbler/action_buildiso.py
index 6dc18a765e..f27c0698b3 100644
--- a/cobbler/action_buildiso.py
+++ b/cobbler/action_buildiso.py
@@ -171,9 +171,17 @@ def generate_netboot_iso(self,imagesdir,isolinuxdir,profiles=None,systems=None,e
                      append_line += " install=http://%s:%s/cblr/links/%s" % (
                          data["server"], self.api.settings().http_port, dist.name
                      )
-                 append_line += " autoyast=%s" % data["kickstart"]
+                 if data["kernel_options"].has_key("autoyast") and data["kernel_options"]["autoyast"] != "":
+                     append_line += " autoyast=%s" % data["kernel_options"]["autoyast"]
+                     del data["kernel_options"]["autoyast"]
+                 else:
+                     append_line += " autoyast=%s" % data["kickstart"]
+
              if dist.breed == "redhat":
+                 if data["proxy"] != "":
+                    append_line += " proxy=%s http_proxy=%s" % (data["proxy"], data["proxy"])
                  append_line += " ks=%s" % data["kickstart"]
+
              if dist.breed in ["ubuntu","debian"]:
                  append_line += " auto-install/enable=true url=%s" % data["kickstart"]
                  if data["proxy"] != "":
@@ -215,10 +223,20 @@ def generate_netboot_iso(self,imagesdir,isolinuxdir,profiles=None,systems=None,e
                     append_line += " install=%s" % data["kernel_options"]["install"]
                     del data["kernel_options"]["install"]
                 else:
-                    append_line += " install=http://%s:%s/cblr/links/%s" % (data["server"], self.api.settings().http_port, dist.name)
-                append_line += " autoyast=%s" % data["kickstart"]
+                    append_line += " install=http://%s:%s/cblr/links/%s" % (
+                        data["server"], self.api.settings().http_port, dist.name
+                    )
+                if data["kernel_options"].has_key("autoyast") and data["kernel_options"]["autoyast"] != "":
+                    append_line += " autoyast=%s" % data["kernel_options"]["autoyast"]
+                    del data["kernel_options"]["autoyast"]
+                else:
+                    append_line += " autoyast=%s" % data["kickstart"]
+
              if dist.breed == "redhat":
+                if data["proxy"] != "":
+                    append_line += " proxy=%s http_proxy=%s" % (data["proxy"], data["proxy"])
                 append_line += " ks=%s" % data["kickstart"]
+
              if dist.breed in ["ubuntu","debian"]:
                 append_line += " auto-install/enable=true url=%s netcfg/disable_dhcp=true" % data["kickstart"]
                 if data["proxy"] != "":
@@ -257,6 +275,8 @@ def generate_netboot_iso(self,imagesdir,isolinuxdir,profiles=None,systems=None,e
              if dist.breed == "redhat":
                 if data["kernel_options"].has_key("ksdevice") and data["kernel_options"]["ksdevice"] != "":
                    my_int = data["kernel_options"]["ksdevice"]
+                   if my_int == "bootif":
+                      my_int = None
                    del data["kernel_options"]["ksdevice"]
                 if data["kernel_options"].has_key("ip") and data["kernel_options"]["ip"] != "":
                    my_ip = data["kernel_options"]["ip"]