diff --git a/.cvsignore b/.cvsignore
index acff170..5e7e910 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1 @@
-anaconda-11.4.0.15.tar.bz2
-anaconda-11.4.0.16.tar.bz2
-anaconda-11.4.0.17.tar.bz2
-anaconda-11.4.0.18.tar.bz2
-anaconda-11.4.0.19.tar.bz2
-anaconda-11.4.0.20.tar.bz2
+anaconda-11.4.0.21.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index bd90b0b..14c56c7 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.0.20
+Version: 11.4.0.21
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define gettextver 0.11
 %define glib2ver 2.11.1-5
 %define intltoolver 0.31.2-3
-%define libdhcpver 1.99.5-1
+%define libdhcpver 1.99.6-1
 %define libselinuxver 1.6
 %define mkinitrdver 5.1.2-1
 %define pykickstartver 0.96
@@ -199,6 +199,15 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jan 14 2008 David Cantrell <dcantrell@redhat.com> - 11.4.0.21-1
+- Inherit from the right versions of pykickstart classes (clumens)
+- Update for nss files moving to /lib (clumens)
+- Remove unneeded arguments from detectHardware function (notting)
+- Symlink all udev support binaries to udevadm (notting)
+- /sbin/restorecon on /etc/modprobe.d (notting)
+- Add the kickstart syntax version to the kickstart file (clumens)
+- Require latest libdhcp to fix x86_64 SIGABRT problems
+
 * Sun Jan 13 2008 Chris Lumens <clumens@redhat.com> - 11.4.0.20-1
 - Install new udev paths so HAL can talk to it (notting)
 - Also get DSO deps for setuid binaries (like X). (clumens)
diff --git a/sources b/sources
index 16a8d02..ae3da8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-041b2ab48746e45bd8abcc336007fb1d  anaconda-11.4.0.20.tar.bz2
+a665dc917ff8dee07860e5c048fd39d6  anaconda-11.4.0.21.tar.bz2