diff --git a/anaconda/pyanaconda/bootloader.py b/anaconda/pyanaconda/bootloader.py
index cd28d32..0beed18 100644
--- a/anaconda/pyanaconda/bootloader.py
+++ b/anaconda/pyanaconda/bootloader.py
@@ -243,12 +243,10 @@ class BootLoader(object):
     def stage2_format_types(self):
         return ["ext4", "ext3", "ext2"]
 
-    # this is so stupid...
-    global_preserve_args = ["speakup_synth", "apic", "noapic", "apm", "ide",
-                            "noht", "acpi", "video", "pci", "nodmraid",
-                            "nompath", "nomodeset", "noiswmd", "fips",
-                            "selinux", "biosdevname"]
-    preserve_args = []
+    global_no_preserve_args = ["inst.stage2", "root", "rescue",
+                               "rd.live.check", "ip", "repo", "ks",
+                               "rd.lvm", "rd.md", "rd.luks", "rd.dm",
+                               "rd.lvm.lv"]
 
     _trusted_boot = False
 
@@ -861,11 +859,10 @@ class BootLoader(object):
             self.boot_args.add("ifname=%s:%s" % (nic, hwaddr.lower()))
 
         #
-        # preservation of some of our boot args
-        # FIXME: this is stupid.
+        # preservation of most of our boot args
         #
-        for opt in self.global_preserve_args + self.preserve_args:
-            if opt not in flags.cmdline:
+        for opt in flags.cmdline.keys():
+            if opt in self.global_no_preserve_args:
                 continue
 
             arg = flags.cmdline.get(opt)