Index: gnome_lirc_properties/lirc.py
===================================================================
--- gnome_lirc_properties/lirc.py	(revision 14)
+++ gnome_lirc_properties/lirc.py	(working copy)
@@ -1014,8 +1014,7 @@
 def has_include_keyword():
     '''Checks if include statements are supported in lircd.conf.'''
 
-    return (config.LSB_RELEASE.check(name='Ubuntu', codename='hardy') or
-            config.LSB_RELEASE.check(name='Ubuntu', release='8.04'))
+    return True
 
 def find_remote_config():
     '''Finds the location our customized lircd.conf file.'''
Index: gnome_lirc_properties/config.py.in
===================================================================
--- gnome_lirc_properties/config.py.in	(revision 14)
+++ gnome_lirc_properties/config.py.in	(working copy)
@@ -6,8 +6,6 @@
 from gnome_lirc_properties.lsb import ReleaseInfo
 from os                        import path
 
-LSB_RELEASE           = ReleaseInfo()
-
 ENABLE_POLICY_KIT     = @ENABLE_POLICY_KIT@
 POLICY_KIT_ACTION     = 'org.gnome.lirc-properties.mechanism.configure'
 
@@ -15,7 +13,7 @@
 
 LIRC_CONFDIR          = '@with_lirc_confdir@'
 
-LIRC_HARDWARE_CONF    = path.join(LIRC_CONFDIR, 'hardware.conf')
+LIRC_HARDWARE_CONF    = path.join('@sysconfdir@', 'sysconfig', 'lirc')
 LIRC_REMOTE_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf.gnome')
 LIRC_DAEMON_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf')
 
Index: gnome_lirc_properties/backend.py
===================================================================
--- gnome_lirc_properties/backend.py	(revision 14)
+++ gnome_lirc_properties/backend.py	(working copy)
@@ -488,7 +488,7 @@
     # with lirc 0.8.3~pre1-0ubuntu4 of Hardy Heron.
 
     __re_remote_directive = re.compile(r'^\s*(?:REMOTE_)?(DRIVER|DEVICE|MODULES|' +
-                                       r'LIRCD_ARGS|LIRCD_CONF|VENDOR|MODEL)=')
+                                       r'LIRCD_OPTIONS|LIRCD_CONF|VENDOR|MODEL)=')
     __re_start_lircd      = re.compile(r'^\s*START_LIRCD=')
 
     def __init__(self, connection=None, path='/'):
@@ -587,6 +587,7 @@
                 continue
 
             # Deal with the START_LIRCD line:
+            # This doesn't do anything on Fedora
 
             match = self.__re_start_lircd.match(line)
 
@@ -598,7 +599,7 @@
                 value = (start_lircd is None) and 'true' or start_lircd
                 start_lircd = None
 
-                print >> output, (match.group(0) + value)
+                # print >> output, (match.group(0) + value)
                 continue
 
             output.write(line)
@@ -616,10 +617,6 @@
         for key, value in receiver_values.items():
             print >> output, ('RECEIVER_%s="%s"' % (key, value))
 
-        if start_lircd is not None:
-            print >> output, '\n# Daemon settings required by gnome-lirc-properties'
-            print >> output, ('START_LIRCD=%s' % start_lircd)
-
         # Replace old file with new contents:
 
         os.unlink(oldfile)
@@ -643,7 +640,7 @@
             'DRIVER': driver,
             'DEVICE': device,
             'MODULES': modules,
-            'LIRCD_ARGS': '',
+            'LIRCD_OPTIONS': '',
             'LIRCD_CONF': '',
         }
 
@@ -762,10 +759,12 @@
         print 'Managing lircd: %s...' % action
 
         if 'enable' == action:
-            self._write_hardware_configuration(start_lircd=True)
+            args = '/sbin/chkconfig', 'lirc', 'on'
+            os.spawnv(os.P_WAIT, args[0], args)
 
         elif 'disable' == action:
-            self._write_hardware_configuration(start_lircd=False)
+            args = '/sbin/chkconfig', 'lirc', 'off'
+            os.spawnv(os.P_WAIT, args[0], args)
 
         else:
             args = '/etc/init.d/lirc', action
