diff --git a/.cvsignore b/.cvsignore
index a8545e4..1e55b34 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-concordance-0.20.tar.bz2
+concordance-0.21.tar.bz2
diff --git a/concordance-gen-policykit-rules.sh b/concordance-gen-policykit-rules.sh
deleted file mode 100644
index defa703..0000000
--- a/concordance-gen-policykit-rules.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-RULE_TEMPLATE_PRE='    <match key="usb_device.vendor_id" int="%s">'
-RULE_TEMPLATE='      <match key="usb_device.product_id" int="%s">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>';
-RULE_TEMPLATE_POST='    </match>'
-
-cat <<END
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
-  <device>
-
-END
-
-VID=0400
-PID=c359
-printf "$RULE_TEMPLATE_PRE\n" $VID
-printf "$RULE_TEMPLATE\n" $PID
-printf "$RULE_TEMPLATE_POST\n"
-
-VID=046d
-printf "$RULE_TEMPLATE_PRE\n" $VID
-for PIDa in `seq 0xc110 0xc14f`; do
-	PID=`printf "%x" $PIDa`
-	printf "$RULE_TEMPLATE\n" $PID
-done
-printf "$RULE_TEMPLATE_POST\n"
-
-cat <<END
-
-  </device>
-</deviceinfo>
-END
-
diff --git a/concordance.spec b/concordance.spec
index 5a8cdd4..0b60390 100644
--- a/concordance.spec
+++ b/concordance.spec
@@ -1,22 +1,16 @@
 Name: concordance
-Version: 0.20
-Release: 6%{?dist}
+Version: 0.21
+Release: 1%{?dist}
 Summary: Software to program the Logitech Harmony remote control
-%define policykit_rules 10-%{name}.fdi
 
 Group: Applications/Communications
 License: GPLv3+
 URL: http://www.phildev.net/concordance/
 Source0: http://downloads.sourceforge.net/sourceforge/concordance/%{name}-%{version}.tar.bz2
-Source1: concordance-gen-policykit-rules.sh
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires: hal
-Requires: pam
-Requires: udev
 BuildRequires: libusb-devel
-BuildRequires: libconcord-devel
-BuildRequires: libxml2
+BuildRequires: libconcord-devel >= %{version}
 
 %description
 This software will allow you to program your Logitech Harmony universal
@@ -35,12 +29,6 @@ cd %{name}
 %configure --enable-shared
 make %{_smp_mflags}
 
-# generate PolicyKit rules
-bash %{SOURCE1} | xmllint - > %{policykit_rules}
-if [ -z %{policykit_rules} ]; then
-	exit 1
-fi
-
 
 %install
 rm -rf %{buildroot}
@@ -48,11 +36,6 @@ rm -rf %{buildroot}
 cd %{name}
 make DESTDIR=%{buildroot} install
 
-# install PolicyKit rules
-install -d %{buildroot}/%{_datadir}/hal/fdi/policy/10osvendor/
-install -m 0644 %{policykit_rules} \
-	%{buildroot}/%{_datadir}/hal/fdi/policy/10osvendor/
-
 
 %clean
 rm -rf %{buildroot}
@@ -62,12 +45,16 @@ rm -rf %{buildroot}
 %defattr(0644, root, root, 0755)
 %doc Changelog CodingStyle LICENSE SubmittingPatches TODO 
 %doc %{name}/README %{name}/INSTALL.linux
-%{_datadir}/hal/fdi/policy/10osvendor/*
 %attr(0755, root, root) %{_bindir}/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Mar 10 2009 Douglas E. Warner <silfreed@silfreed.net> 0.21-1
+- moved udev/policykit rules to libconcord package
+- supports flashing 5** remotes
+- improved IR learning support
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index a4fbdaf..7e999db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c2487e851864f38c4da4fe02093652a5  concordance-0.20.tar.bz2
+87878bb23c5f4173c6bc744b93d5694d  concordance-0.21.tar.bz2