diff --git a/.cvsignore b/.cvsignore
index 92942d4..ffd718e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-PackageKit-0.3.11.tar.gz
+PackageKit-0.4.0.tar.gz
diff --git a/PackageKit.spec b/PackageKit.spec
index 0421177..46e4b25 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -7,11 +7,11 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.3.11
-Release:   2%{?dist}
+Version:   0.4.0
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
-URL:       http://packagekit.freedesktop.org
+URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,8 @@ BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: qt4-devel
 BuildRequires: cppunit-devel
+BuildRequires: pango-devel
+BuildRequires: fontconfig-devel
 
 %description
 PackageKit is a D-Bus abstraction layer that allows the session user
@@ -197,6 +199,26 @@ Provides: codeina = 0.10.1-10
 The PackageKit GStreamer plugin allows any Gstreamer application to install
 codecs from configured repositories using PackageKit.
 
+%package gtk-module
+Summary: Install fonts automatically using PackageKit
+Group: Development/Libraries
+Requires: pango
+Requires: PackageKit-glib = %{version}-%{release}
+
+%description gtk-module
+The PackageKit GTK+ module allows any Pango application to install
+fonts from configured repositories using PackageKit.
+
+%package command-not-found
+Summary: Ask the user to install command line programs automatically
+Group: Development/Libraries
+Requires: bash
+Requires: PackageKit-glib = %{version}-%{release}
+
+%description command-not-found
+A simple helper that offers to install new packages on the command line
+using PackageKit.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -216,6 +238,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
+
 chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py
 touch $RPM_BUILD_ROOT%{_localstatedir}/cache/PackageKit/groups.sqlite
 
@@ -320,6 +345,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %files udev-helper
 %defattr(-, root, root)
+%dir %{_localstatedir}/run/PackageKit
+%dir %{_localstatedir}/run/PackageKit/udev
 %doc README AUTHORS NEWS COPYING
 %{_sysconfdir}/udev/rules.d/*.rules
 /lib/udev/*.sh
@@ -351,6 +378,17 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libexecdir}/pk-gstreamer-install
 %{_libexecdir}/gst-install-plugins-helper
 
+%files gtk-module
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/gtk-2.0/modules/*.so
+
+%files command-not-found
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_sysconfdir}/profile.d/*
+%{_libexecdir}/pk-command-not-found
+
 %files glib-devel
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
@@ -379,6 +417,14 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Tue Dec 09 2008 Richard Hughes  <rhughes@redhat.com> - 0.4.0-1
+- New upstream version
+- Now integrates with BASH suggesting replacements and offering to install
+  missing packages.
+- Now integrates with Pango using a gtk-module to install missing fonts.
+- Much tighter security model and new audit logging framework.
+- Lots of new, untested, code so probably not a good idea for F10.
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.3.11-2
 - Rebuild for Python 2.6
 
diff --git a/sources b/sources
index d98fdbe..9041453 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19a58708695c178d44b40f6cf46dc560  PackageKit-0.3.11.tar.gz
+8402588f2a1b6f6706d81d08cc1577f6  PackageKit-0.4.0.tar.gz