diff --git a/SOURCES/dconf-shutdown-hang.patch b/SOURCES/dconf-shutdown-hang.patch
new file mode 100644
index 0000000..f675c45
--- /dev/null
+++ b/SOURCES/dconf-shutdown-hang.patch
@@ -0,0 +1,26 @@
+--- a/service/dconf-service.c
++++ b/service/dconf-service.c
+@@ -39,6 +39,8 @@ typedef struct
+ DConfBlame *blame;
+ GHashTable *writers;
+ GArray *subtree_ids;
++
++ gboolean signalled;
+ } DConfService;
+
+ G_DEFINE_TYPE (DConfService, dconf_service, G_TYPE_APPLICATION)
+@@ -48,7 +50,10 @@ dconf_service_signalled (gpointer user_data)
+ {
+ DConfService *service = user_data;
+
+- g_application_release (G_APPLICATION (service));
++ if (!service->signalled)
++ g_application_release (G_APPLICATION (service));
++
++ service->signalled = TRUE;
+
+ return G_SOURCE_REMOVE;
+ }
+--
+1.8.5.3
+
diff --git a/SPECS/dconf.spec b/SPECS/dconf.spec
index 6e25184..1f5afc6 100644
--- a/SPECS/dconf.spec
+++ b/SPECS/dconf.spec
@@ -3,7 +3,7 @@
Name: dconf
Version: 0.16.0
-Release: 3%{?dist}
+Release: 6%{?dist}
Summary: A configuration system
Group: System Environment/Base
@@ -15,6 +15,7 @@ Source0: http://download.gnome.org/sources/dconf/0.16/dconf-%{version}.ta
# upstream fixes
Patch0: 0001-DConfChangeset-expose-concept-of-sealing.patch
Patch1: 0002-engine-seal-changesets-on-changes.patch
+Patch2: dconf-shutdown-hang.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel
@@ -52,6 +53,7 @@ dconf-editor allows you to browse and modify dconf databases.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%configure --disable-static
@@ -155,6 +157,16 @@ done
%{_mandir}/man1/dconf-editor.1.gz
%changelog
+* Fri Apr 4 2014 Marek Kasik <mkasik@redhat.com> - 0.16.0-6
+- Don't hang shutdown
+- Resolves: #1082994
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.16.0-5
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.16.0-4
+- Mass rebuild 2013-12-27
+
* Wed Jul 31 2013 Ray Strode <rstrode@redhat.com> 0.16.0-3
- Add system dbs for distro, site, and machine local dconf databases
Resolves: #990630