Index: gnome_lirc_properties/lirc.py
===================================================================
--- gnome_lirc_properties/lirc.py	(revision 14)
+++ gnome_lirc_properties/lirc.py	(working copy)
@@ -1011,26 +1011,17 @@
         except KeyError:
             return default
 
-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'))
-
 def find_remote_config():
     '''Finds the location our customized lircd.conf file.'''
 
-    if has_include_keyword():
-        return config.LIRC_REMOTE_CONF, True
+    return config.LIRC_REMOTE_CONF
 
-    return config.LIRC_DAEMON_CONF, False
-
 def check_hardware_settings(selected_remote):
     '''Check if the hardware settings are sane.'''
 
-    remote_config, can_include = find_remote_config()
+    remote_config = find_remote_config()
 
-    if can_include and not re.search(
+    if not re.search(
         r'^\s*include\s+%s\s*$' % re.escape(config.LIRC_REMOTE_CONF),
         open(config.LIRC_DAEMON_CONF).read(), re.MULTILINE):
         return False
Index: gnome_lirc_properties/config.py.in
===================================================================
--- gnome_lirc_properties/config.py.in	(revision 14)
+++ gnome_lirc_properties/config.py.in	(working copy)
@@ -3,11 +3,8 @@
 Generated by config.status from config.py.in.
 """
 
-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'
 
@@ -27,4 +24,4 @@
 URI_UPDATES           = '@with_download_uri@'
 
 # remove temporary objects from namespace
-del path, ReleaseInfo
+del path
Index: gnome_lirc_properties/lsb.py
===================================================================
--- gnome_lirc_properties/lsb.py	(revision 14)
+++ gnome_lirc_properties/lsb.py	(working copy)
@@ -1,79 +0,0 @@
-# Infrared Remote Control Properties for GNOME
-# Copyright (C) 2008 Fluendo Embedded S.L. (www.fluendo.com)
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-'''
-Linux Standard Base (LSB) releated information.
-'''
-
-from ConfigParser import SafeConfigParser
-from StringIO     import StringIO
-
-import re
-
-def version_number(text):
-    '''Parses a version number and converts it into a tuple.'''
-
-    return tuple([int(n, 10) for n in re.split(r'[^0-9]', text)])
-
-class ReleaseInfo(object):
-    '''LSB compliant distribution description.'''
-
-    def __init__(self, filename=None, fileobj=None):
-        lsb_section = 'LSB-Release'
-
-        if not fileobj:
-            fileobj = open(filename or '/etc/lsb-release')
-
-        strbuf = StringIO()
-        strbuf.write('[%s]\n' % lsb_section)
-        strbuf.write(fileobj.read())
-        strbuf.seek(0)
-
-        parser = SafeConfigParser()
-        parser.readfp(strbuf)
-
-        self.__name = parser.get(lsb_section, 'DISTRIB_ID').strip('"')
-        self.__release = parser.get(lsb_section, 'DISTRIB_RELEASE').strip('"')
-        self.__codename = parser.get(lsb_section, 'DISTRIB_CODENAME').strip('"')
-        self.__description = parser.get(lsb_section, 'DISTRIB_DESCRIPTION').strip('"')
-
-    def check(self, name=None, codename=None, release=None):
-        '''Checks if this Linux distribution matches certain criterions.'''
-
-        if name is not None and name != self.name:
-            return False
-
-        if codename is not None and codename != self.codename:
-            return False
-
-        if release is not None:
-            if version_number(release) > version_number(self.release):
-                return False
-
-        return True
-
-    def __str__(self):
-        return '%s (%s)' % (self.description, self.codename)
-
-    # pylint: disable-msg=W0212
-    name = property(lambda self: self.__name)
-    release = property(lambda self: self.__release)
-    codename = property(lambda self: self.__codename)
-    description = property(lambda self: self.__description)
-
-if '__main__' == __name__:
-    print ReleaseInfo()
Index: gnome_lirc_properties/Makefile.am
===================================================================
--- gnome_lirc_properties/Makefile.am	(revision 14)
+++ gnome_lirc_properties/Makefile.am	(working copy)
@@ -8,7 +8,6 @@
 	config.py \
 	hardware.py \
 	lirc.py \
-	lsb.py \
 	model.py \
 	policykit.py
 
Index: gnome_lirc_properties/backend.py
===================================================================
--- gnome_lirc_properties/backend.py	(revision 14)
+++ gnome_lirc_properties/backend.py	(working copy)
@@ -718,7 +715,7 @@
             contents = ''
 
         # find existing include statement:
-        include_statement = 'include %s\n' % redirect
+        include_statement = 'include <%s>\n' % redirect
         pattern = r'^\s*(#.*)?include\s+%s\s*$' % re.escape(redirect)
         pattern = re.compile(pattern, re.MULTILINE)
         match   = pattern.search(contents)
@@ -732,7 +729,7 @@
                 contents += '#\n'
                 contents += '# Feel free to add any custom remotes to the configuration\n'
                 contents += '# via additional include directives or below the existing\n'
-                contents += '# Ubuntu include directives from your selected remote and/or\n'
+                contents += '# include directives from your selected remote and/or\n'
                 contents += '# transmitter.\n'
                 contents += '#\n'
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 14)
+++ configure.ac	(working copy)
@@ -42,6 +42,38 @@
 POLICY_KIT_ACTION="org.gnome.lirc-properties.mechanism.configure"
 AC_SUBST([POLICY_KIT_ACTION])
 
+dnl check for new enough lirc ===
+
+AC_PATH_PROG([LIRCD], [lircd])
+
+HAVE_LIRCD="yes"
+if test -z $LIRCD ; then
+  HAVE_LIRCD="no"
+else
+  LIRCD_VERSION=`lircd --version|head -n 1|sed 's/^lircd //'|sed 's/ (.*)//'`
+  LIRCD_MAJOR=`echo $LIRCD_VERSION | cut -d. -f1 | sed 's/[[a-zA-Z\-]].*//g'`
+  LIRCD_MINOR=`echo $LIRCD_VERSION | cut -d. -f2 | sed 's/[[a-zA-Z\-]].*//g'`
+  LIRCD_MICRO=`echo $LIRCD_VERSION | cut -d. -f3 | sed 's/[[a-zA-Z\-]].*//g'`
+  if [[ "$LIRCD_MAJOR" -eq "0" ]] && \
+	  [[ "$LIRCD_MINOR" -lt "8" ]]; then
+	  AC_MSG_WARN([lircd >= 0.8.4 is required, you have $LIRCD_VERSION])
+	  HAVE_LIRCD="no"
+  elif [[ "$LIRCD_MAJOR" -eq "0" ]] && \
+	  [[ "$LIRCD_MINOR" -eq "8" ]] && \
+	  [[ "$LIRCD_MICRO" -lt "4" ]]; then
+	  AC_MSG_WARN([lircd >= 0.8.4 is required, you have $LIRCD_VERSION])
+	  HAVE_LIRCD="no"
+  fi
+fi
+
+AC_MSG_CHECKING([new enough lircd daemon])
+if test x"$HAVE_LIRCD" != xyes ;
+then
+  AC_MSG_ERROR([no])
+else
+  AC_MSG_RESULT([yes])
+fi
+
 dnl support custom LIRC folders ===
 
 expand_vars() {
