diff --git a/.gitignore b/.gitignore
index bfb40d9..1aa56a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /bluez-4.*.tar.gz
 /bluez-5.9.tar.xz
 /bluez-5.10.tar.xz
+/bluez-5.11.tar.xz
diff --git a/0001-obex-Use-user-s-cache-dir-as-a-default-root.patch b/0001-obex-Use-user-s-cache-dir-as-a-default-root.patch
deleted file mode 100644
index 9cdbd3e..0000000
--- a/0001-obex-Use-user-s-cache-dir-as-a-default-root.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 841896ae172c08c1652af88d0994f0349912ed14 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sun, 10 Nov 2013 15:24:20 +0100
-Subject: [PATCH] obex: Use user's cache dir as a default root
-
-It's per-user, so we won't try to overwrite somebody else's
-files in /tmp when that happens. It's also (unless we have a
-particularly bizarre setup) on the same partition as the destination
-folder which means we can atomically move the file to the destination
-with a unique filename.
----
- obexd/src/main.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/obexd/src/main.c b/obexd/src/main.c
-index 61a06b2..80645f8 100644
---- a/obexd/src/main.c
-+++ b/obexd/src/main.c
-@@ -50,8 +50,6 @@
- #include "obexd.h"
- #include "server.h"
- 
--#define DEFAULT_ROOT_PATH "/tmp"
--
- #define DEFAULT_CAP_FILE CONFIGDIR "/capability.xml"
- 
- static GMainLoop *main_loop = NULL;
-@@ -167,7 +165,7 @@ static GOptionEntry options[] = {
- 				"Specify root folder location. Both absolute "
- 				"and relative can be used, but relative paths "
- 				"are assumed to be relative to user $HOME "
--				"folder", "PATH" },
-+				"folder. Default $XDG_CACHE_HOME", "PATH" },
- 	{ "root-setup", 'S', 0, G_OPTION_ARG_STRING, &option_root_setup,
- 				"Root folder setup script", "SCRIPT" },
- 	{ "symlinks", 'l', 0, G_OPTION_ARG_NONE, &option_symlinks,
-@@ -285,8 +283,11 @@ int main(int argc, char *argv[])
- 		exit(EXIT_FAILURE);
- 	}
- 
--	if (option_root == NULL)
--		option_root = g_strdup(DEFAULT_ROOT_PATH);
-+	if (option_root == NULL) {
-+		option_root = g_build_filename(g_get_user_cache_dir(), "obexd",
-+									NULL);
-+		g_mkdir_with_parents(option_root, 0700);
-+	}
- 
- 	if (option_root[0] != '/') {
- 		char *old_root = option_root, *home = getenv("HOME");
--- 
-1.8.4.2
-
diff --git a/bluez.spec b/bluez.spec
index 6a5dc5c..f10bad9 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -2,8 +2,8 @@
 
 Summary: Bluetooth utilities
 Name: bluez
-Version: 5.10
-Release: 3%{?dist}
+Version: 5.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.bluez.org/
@@ -17,8 +17,6 @@ Patch1: playstation-peripheral-pugin-v5.x.patch
 Patch2: 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
 # Non-upstream
 Patch3: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-# Upstream patch
-Patch4: 0001-obex-Use-user-s-cache-dir-as-a-default-root.patch
 
 BuildRequires: git
 BuildRequires: flex
@@ -233,6 +231,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/bluetooth/
 /lib/udev/rules.d/97-hid2hci.rules
 
 %changelog
+* Mon Nov 18 2013 Bastien Nocera <bnocera@redhat.com> 5.11-1
+- Update to 5.11
+
 * Tue Nov 12 2013 Bastien Nocera <bnocera@redhat.com> 5.10-3
 - Default to the XDG cache dir for receiving files
 
diff --git a/sources b/sources
index eadd107..c4bb424 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ca7c5343b14ca42c2973c22e69d4eb8  bluez-5.10.tar.xz
+8a2544d8c88e1f4bd3abe9525282b13c  bluez-5.11.tar.xz