Index: gnome_lirc_properties/config.py.in
===================================================================
--- gnome_lirc_properties/config.py.in	(revision 44)
+++ gnome_lirc_properties/config.py.in	(working copy)
@@ -12,7 +12,7 @@
 
 LIRC_CONFDIR          = '@with_lirc_confdir@'
 
-LIRC_HARDWARE_CONF    = path.join(LIRC_CONFDIR, 'hardware.conf')
+LIRC_HARDWARE_CONF    = path.join('@sysconfdir@', 'sysconfig', 'lircd')
 LIRC_REMOTE_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf.gnome')
 LIRC_DAEMON_CONF      = path.join(LIRC_CONFDIR, 'lircd.conf')
 
Index: gnome_lirc_properties/ui/RemoteControlProperties.py
===================================================================
--- gnome_lirc_properties/ui/RemoteControlProperties.py	(revision 44)
+++ gnome_lirc_properties/ui/RemoteControlProperties.py	(working copy)
@@ -297,13 +297,13 @@
         #
         # NOTE: Ubuntu's lirc script doesn't distinguish between remote and
         # receiver settings in "hardware.conf", whereas we have to. For that
-        # reason the device node's name is stored in REMOTE_DEVICE, instead
+        # reason the device node's name is stored in DEVICE, instead
         # of RECEIVER_DEVICE.
         #
         self.selected_receiver = (
             settings.get('RECEIVER_VENDOR'),
             settings.get('RECEIVER_MODEL'),
-            settings.get('REMOTE_DEVICE'),
+            settings.get('DEVICE'),
         )
 
         # Try to select configured remote vendor:
Index: gnome_lirc_properties/backend.py
===================================================================
--- gnome_lirc_properties/backend.py	(revision 44)
+++ gnome_lirc_properties/backend.py	(working copy)
@@ -593,6 +593,7 @@
                 continue
 
             # Deal with the START_LIRCD line:
+            # This doesn't do anything on Fedora/Mandriva
 
             match = self.__re_start_lircd.match(line)
 
@@ -604,7 +605,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)
@@ -615,17 +616,13 @@
         if remote_values:
             print >> output, '\n# Remote settings required by gnome-lirc-properties'
         for key, value in remote_values.items():
-            print >> output, ('REMOTE_%s="%s"' % (key, value))
+            print >> output, ('%s="%s"' % (key, value))
 
         if receiver_values:
             print >> output, '\n# Receiver settings required by gnome-lirc-properties'
         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)
@@ -767,10 +764,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
Index: gnome_lirc_properties/policykit.py
===================================================================
--- gnome_lirc_properties/policykit.py	(revision 44)
+++ gnome_lirc_properties/policykit.py	(working copy)
@@ -43,7 +43,7 @@
         authorized = self.policy_kit.IsProcessAuthorized(action_id, pid, False)
         logging.debug('%s: authorized=%r', action_id, authorized)
 
-        return ('no' != authorized)
+        return ('yes' == authorized)
 
     def obtain_authorization(self, widget, action_id=config.POLICY_KIT_ACTION):
         '''
Index: configure.ac
===================================================================
--- configure.ac	(revision 44)
+++ configure.ac	(working copy)
@@ -60,7 +60,7 @@
 	  HAVE_LIRCD="no"
   elif [[ "$LIRCD_MAJOR" -eq "0" ]] && \
 	  [[ "$LIRCD_MINOR" -eq "8" ]] && \
-	  [[ "$LIRCD_MICRO" -lt "4" ]]; then
+	  [[ "$LIRCD_MICRO" -lt "3" ]]; then
 	  AC_MSG_WARN([lircd >= 0.8.4 is required, you have $LIRCD_VERSION])
 	  HAVE_LIRCD="no"
   fi
Index: data/gnome-lirc-properties.desktop.in.in
===================================================================
--- data/gnome-lirc-properties.desktop.in.in	(revision 44)
+++ data/gnome-lirc-properties.desktop.in.in	(working copy)
@@ -7,7 +7,7 @@
 Exec=@prefix@/bin/gnome-lirc-properties
 Icon=gnome-lirc-properties
 StartupNotify=true
-Categories=GNOME;GTK;Settings;HardwareSettings;System;
+Categories=GNOME;GTK;Settings;HardwareSettings;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-lirc-properties
 X-GNOME-Bugzilla-Component=general