diff --git a/0001-Remove-double-g_option_context_free-call.patch b/0001-Remove-double-g_option_context_free-call.patch
new file mode 100644
index 0000000..354954a
--- /dev/null
+++ b/0001-Remove-double-g_option_context_free-call.patch
@@ -0,0 +1,25 @@
+From 86b16d8a63d8d6191533418dd1c38ce35c3fbf0a Mon Sep 17 00:00:00 2001
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Mon, 12 Jul 2010 23:59:34 -0300
+Subject: [PATCH] Remove double g_option_context_free() call
+
+---
+ src/main.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 94a6f0e..6113217 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -410,8 +410,6 @@ int main(int argc, char *argv[])
+ 		}
+ 	}
+ 
+-	g_option_context_free(context);
+-
+ 	if (option_detach == TRUE && option_udev == FALSE) {
+ 		if (daemon(0, 0)) {
+ 			perror("Can't start daemon");
+-- 
+1.7.1
+
diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes
index 0b8e3d3..b7fd706 100644
--- a/bluez-gstreamer.changes
+++ b/bluez-gstreamer.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 13 08:12:57 UTC 2010 - seife@opensuse.org
+
+- fix instant segfault of bluetoothd (upstream commit
+  86b16d8a63d8d6191533418dd1c38ce35c3fbf0a)
+
 -------------------------------------------------------------------
 Tue Jul 13 06:19:00 UTC 2010 - seife@opensuse.org
 
diff --git a/bluez.changes b/bluez.changes
index 0b8e3d3..b7fd706 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 13 08:12:57 UTC 2010 - seife@opensuse.org
+
+- fix instant segfault of bluetoothd (upstream commit
+  86b16d8a63d8d6191533418dd1c38ce35c3fbf0a)
+
 -------------------------------------------------------------------
 Tue Jul 13 06:19:00 UTC 2010 - seife@opensuse.org
 
diff --git a/bluez.spec b/bluez.spec
index d5e0bf1..047b381 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -38,6 +38,8 @@ Source6:        README.SUSE
 Source7:        bluetooth.modprobe
 Patch1:         bluez-4.44-udev-use-helperscript.diff
 Patch2:         001-remove-rule-dell-mouse.patch
+# needed until next upstream release --seife
+Patch42:        0001-Remove-double-g_option_context_free-call.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       bluez-utils = 3.36
 Obsoletes:      bluez-utils <= 3.36
@@ -176,6 +178,7 @@ Authors:
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch42 -p1
 cp %{S:6} .
 %{?suse_update_config:%{suse_update_config -f . }}
 mkdir dbus-apis