diff --git a/.cvsignore b/.cvsignore
index 9135cad..2318bc9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ console-kit-0.1.0.tar.gz
 ConsoleKit-0.1.3.git20070301.tar.gz
 ConsoleKit-0.2.0.tar.gz
 ConsoleKit-0.2.1.git20070204.tar.gz
+ConsoleKit-0.2.1.tar.gz
diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index e5f4da5..08fd0e7 100644
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -5,12 +5,11 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.2.1
-Release: 0.git20070204%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://consolekit.freedesktop.org
-Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.git20070204.tar.gz
-Patch0: ConsoleKit-0.2.0-daemonize-properly.patch
+Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus >= %{dbus_version}
 
@@ -72,7 +71,6 @@ Developer documentation docs for HAL.
 
 %prep
 %setup -q
-%patch0 -p1 -b .daemonize-properly
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs
@@ -139,6 +137,10 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Mon Apr 16 2007 David Zeuthen <davidz@redhat.com> - 0.2.1-1
+- Update to upstream release 0.2.1
+- Drop the patch to daemonize properly as that was merged upstream
+
 * Mon Apr 02 2007 David Zeuthen <davidz@redhat.com> - 0.2.1-0.git20070402
 - Update to git snapshot to get a lot of bug fixes
 - Use libX11 rather than gtk2 to verify X11 sessions; update BR and R
diff --git a/sources b/sources
index ea744f5..320f078 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71fe7a52a7738faa12c74570e0679313  ConsoleKit-0.2.1.git20070204.tar.gz
+8bf5e83931a8a3c2abcd541781e1554c  ConsoleKit-0.2.1.tar.gz