diff --git a/.gitignore b/.gitignore
index 9ee3d81..ea3138a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 oddjob-0.29.1-1.tar.gz
 oddjob-0.30.tar.gz
 oddjob-0.30.1.tar.gz
+/oddjob-0.31.tar.gz
diff --git a/oddjob.spec b/oddjob.spec
index 5487e03..402c329 100644
--- a/oddjob.spec
+++ b/oddjob.spec
@@ -2,14 +2,14 @@
 %global dbus_send /bin/dbus-send
 
 Name: oddjob
-Version: 0.30.2
-Release: 3%{?dist}
+Version: 0.31
+Release: 1%{?dist}
 Source: http://fedorahosted.org/released/oddjob/oddjob-%{version}.tar.gz
 Summary: A D-Bus service which runs odd jobs on behalf of client applications
 License: BSD
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: dbus-devel >= 0.22, libselinux-devel, libxml2-devel
+BuildRequires: dbus-devel >= 0.22, dbus-x11, libselinux-devel, libxml2-devel
 BuildRequires: pam-devel, python-devel, pkgconfig
 BuildRequires: cyrus-sasl-devel, krb5-devel, openldap-devel
 BuildRequires: docbook-dtds, xmlto
@@ -127,6 +127,9 @@ rm -fr "$RPM_BUILD_ROOT"
 %endif
 
 %post
+if test $1 -eq 1 ; then
+	killall -HUP dbus-daemon 2>&1 > /dev/null
+fi
 /sbin/chkconfig --add oddjobd
 
 %postun
@@ -154,12 +157,25 @@ fi
 exit 0
 
 %changelog
+* Tue Jan 25 2011 Nalin Dahyabhai <nalin@redhat.com> 0.31-1
+- require dbus-x11 so that the tests can use dbus-launch
+- try to read the default umask from /etc/login.defs (more of #666418)
+
+* Mon Jan  3 2011 Nalin Dahyabhai <nalin@redhat.com>
+- when the mkhomedir helper has to create intermediate directories, don't
+  apply a umask that might have been supplied on its command line (#666418)
+
 * Fri Nov  5 2010 Nalin Dahyabhai <nalin@redhat.com> 0.30.2-3
 - rebuild with new libxml2
 
 * Wed Sep 29 2010 jkeating - 0.30.2-2
 - Rebuilt for gcc bug 634757
 
+* Thu Sep 23 2010 Nalin Dahyabhai <nalin@redhat.com> 0.30.2-2
+- try to SIGHUP the messagebus daemon at first install so that it'll
+  let us claim our service name if it isn't restarted before we are
+  first started (same as #636876)
+
 * Thu Sep 16 2010 Nalin Dahyabhai <nalin@redhat.com> 0.30.2-1
 - don't try to "close" our shared connection to the bus when the bus
   hangs up on us -- at some point libdbus started abort()ing when we try
diff --git a/sources b/sources
index d72b0e9..2d44e6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a45873644f51b8864b5096d1880d8e8  oddjob-0.30.2.tar.gz
+71650bd2869ca4c4774a3b2eec027643  oddjob-0.31.tar.gz