diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes
index 00ab226..68e2613 100644
--- a/libproxy-plugins.changes
+++ b/libproxy-plugins.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 26 18:07:54 UTC 2013 - dimstar@opensuse.org
+
+- Add libproxy-pxgsettings-crash.patch: fix crash in pxgsettings
+  when it's closing down (bnc#836576).
+
 -------------------------------------------------------------------
 Fri Aug  2 14:41:10 UTC 2013 - dimstar@opensuse.org
 
diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec
index 27292c1..8226b59 100644
--- a/libproxy-plugins.spec
+++ b/libproxy-plugins.spec
@@ -43,6 +43,8 @@ Source:         http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz
 # Script used for automatic snapshot updates
 Source98:       update-from-svn.sh
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM libproxy-pxgsettings-crash.patch bnc#836576 dimstar@opensuse.org -- Fix crash when pxgsettings is closing, taken from svn.
+Patch0:         libproxy-pxgsettings-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -304,6 +306,7 @@ libproxy offers the following features: * extremely small core
 
 %prep
 %setup -q -n %{_sourcename}
+%patch0
 mkdir build
 
 %build
diff --git a/libproxy-pxgsettings-crash.patch b/libproxy-pxgsettings-crash.patch
new file mode 100644
index 0000000..5f53132
--- /dev/null
+++ b/libproxy-pxgsettings-crash.patch
@@ -0,0 +1,15 @@
+Index: libproxy/modules/pxgsettings.cpp
+===================================================================
+--- libproxy/modules/pxgsettings.cpp.orig
++++ libproxy/modules/pxgsettings.cpp
+@@ -157,9 +157,7 @@ int main(int argc, char **argv) {
+ 	g_main_loop_run(loop);
+ 
+ 	// Cleanup
+-	while (G_IS_OBJECT(client)) {
+-		g_object_unref(client);
+-	}
++	g_object_unref(client);
+ 	g_io_channel_shutdown(inchan,  FALSE, NULL);
+ 	g_io_channel_shutdown(outchan, FALSE, NULL);
+ 	g_io_channel_unref(inchan);
diff --git a/libproxy.changes b/libproxy.changes
index 00ab226..68e2613 100644
--- a/libproxy.changes
+++ b/libproxy.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 26 18:07:54 UTC 2013 - dimstar@opensuse.org
+
+- Add libproxy-pxgsettings-crash.patch: fix crash in pxgsettings
+  when it's closing down (bnc#836576).
+
 -------------------------------------------------------------------
 Fri Aug  2 14:41:10 UTC 2013 - dimstar@opensuse.org
 
diff --git a/libproxy.spec b/libproxy.spec
index 1c1a8d3..bea1a67 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -43,6 +43,8 @@ Source:         http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz
 # Script used for automatic snapshot updates
 Source98:       update-from-svn.sh
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM libproxy-pxgsettings-crash.patch bnc#836576 dimstar@opensuse.org -- Fix crash when pxgsettings is closing, taken from svn.
+Patch0:         libproxy-pxgsettings-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -304,6 +306,7 @@ libproxy offers the following features: * extremely small core
 
 %prep
 %setup -q -n %{_sourcename}
+%patch0
 mkdir build
 
 %build