diff --git a/.cvsignore b/.cvsignore
index a337be7..c5ad981 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 console-kit-0.1.0.tar.gz
 ConsoleKit-0.1.3.git20070301.tar.gz
+ConsoleKit-0.2.0.tar.gz
diff --git a/ConsoleKit-0.2.0-daemonize-properly.patch b/ConsoleKit-0.2.0-daemonize-properly.patch
new file mode 100644
index 0000000..38f0cb0
--- /dev/null
+++ b/ConsoleKit-0.2.0-daemonize-properly.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main.c b/src/main.c
+index 446b291..9ae9e10 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -256,7 +256,7 @@ main (int    argc,
+         ck_debug ("initializing console-kit-daemon %s", VERSION);
+ 
+         /* Don't close stdout and stderr for now */
+-        if (! no_daemon && daemon (0, 1)) {
++        if (! no_daemon && daemon (0, 0)) {
+                 g_error ("Could not daemonize: %s", g_strerror (errno));
+         }
+ 
diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index 14afdce..d0e5907 100644
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -4,14 +4,14 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.1.3
-Release: 0.git20070301.1%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://consolekit.freedesktop.org
-Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.git20070301.tar.gz
+Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.gz
+Patch0: ConsoleKit-0.2.0-daemonize-properly.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: ConsoleKit-0.1.3-allow-uid0.patch
 Requires: dbus >= %{dbus_version}
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -49,10 +49,10 @@ Headers, libraries and API docs for ConsoleKit
 
 %prep
 %setup -q
-%patch1 -p0
+%patch0 -p1 -b .daemonize-properly
 
 %build
-%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module
+%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-slibdir=/lib
 
 make
 
@@ -87,6 +87,7 @@ fi
 %{_sysconfdir}/rc.d/init.d/ConsoleKit
 %{_sbindir}/console-kit-daemon
 %{_bindir}/ck-list-sessions
+%{_libexecdir}/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -103,6 +104,10 @@ fi
 
 
 %changelog
+* Mon Mar 19 2007 David Zeuthen <davidz@redhat.com> - 0.2.0-1
+- Update to upstream release 0.2.0
+- Daemonize properly (#229206)
+
 * Sat Mar  3 2007 David Zeuthen <davidz@redhat.com> - 0.1.3-0.git20070301.1
 - Allow caller to pass uid=0 in libck-connector
 
diff --git a/sources b/sources
index e6ef0e4..82a8191 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d2b18c8b3ef3d2c8e7c915414324706  ConsoleKit-0.1.3.git20070301.tar.gz
+e1ffc51b71e955a8703bcf31ff505f50  ConsoleKit-0.2.0.tar.gz