diff --git a/.cvsignore b/.cvsignore
index 585ef66..4d3d86c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bluez-4.22.tar.gz
+bluez-4.25.tar.gz
diff --git a/bluez.spec b/bluez.spec
index 6615d1a..6110ed2 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,14 +1,13 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.22
-Release: 2%{?dist}
+Version: 4.25
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
 Source3: bluez-uinput.modules
-Source4: dbus-bluetooth.conf
 Patch1: bluez-utils-oui-usage.patch
 Patch2: 0001-Add-icon-for-other-audio-device.patch
 
@@ -101,8 +100,6 @@ use in Bluetooth applications.
 %patch1 -p0 -b .oui
 %patch2 -p1
 
-cp -a %{SOURCE4} src/bluetooth.conf
-
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
 make
@@ -192,6 +189,9 @@ fi
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sat Jan 03 2009 - Bastien Nocera <bnocera@redhat.com> - 4.25-1
+- Update to 4.25
+
 * Tue Dec 09 2008 - Bastien Nocera <bnocera@redhat.com> - 4.22-2
 - Fix D-Bus configuration for latest D-Bus (#475069)
 
diff --git a/dbus-bluetooth.conf b/dbus-bluetooth.conf
deleted file mode 100644
index c047623..0000000
--- a/dbus-bluetooth.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- This configuration file specifies the required security policies
-     for Bluetooth core daemon to work. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- ../system.conf have denied everything, so we just punch some holes -->
-
-  <policy user="root">
-    <allow own="org.bluez"/>
-    <allow send_destination="org.bluez"/>
-    <allow send_interface="org.bluez.Agent"/>
-  </policy>
-
-  <policy at_console="true">
-    <allow send_destination="org.bluez"/>
-  </policy>
-
-  <policy context="default">
-    <deny send_destination="org.bluez"/>
-  </policy>
-
-</busconfig>
diff --git a/sources b/sources
index 8581267..19e1f50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8302c23d08c1fa370f8bb81a6926ff2  bluez-4.22.tar.gz
+1f5464b23be0774571e60f9012d50280  bluez-4.25.tar.gz