diff --git a/bluez-4.57.tar.bz2 b/bluez-4.57.tar.bz2
deleted file mode 100644
index 4fe5034..0000000
--- a/bluez-4.57.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f0791934c6d212308fdff1552b9dcdf8921c1049277c689a4dbe5b5d0f703fc
-size 780975
diff --git a/bluez-4.58.tar.bz2 b/bluez-4.58.tar.bz2
new file mode 100644
index 0000000..caa16fe
--- /dev/null
+++ b/bluez-4.58.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3f034f9c1697c6563ee047ff2ea6809c684a3fc11486de6c3e8141a0d5c0136
+size 780831
diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes
index d7bc2ad..709f11e 100644
--- a/bluez-gstreamer.changes
+++ b/bluez-gstreamer.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 16 09:02:00 CET 2009 - seife@opensuse.org
+
+- update to bluez-4.58:
+  - Fix crash when adapter agent exists during authentication.
+  - Fix CK-20W quirks for play and pause events.
+
 -------------------------------------------------------------------
 Mon Nov  2 21:51:12 CET 2009 - seife@opensuse.org
 
diff --git a/bluez-gstreamer.spec b/bluez-gstreamer.spec
index 29f56d6..5def050 100644
--- a/bluez-gstreamer.spec
+++ b/bluez-gstreamer.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package bluez-gstreamer (Version 4.57)
+# spec file for package bluez-gstreamer (Version 4.58)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,11 +24,11 @@ BuildRequires:  glib2-devel libnl-devel libusb-devel
 BuildRequires:  alsa-devel libsndfile-devel pkg-config udev
 BuildRequires:  gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
 Url:            http://www.bluez.org
-Version:        4.57
+Version:        4.58
 Release:        1
 Summary:        Bluetooth Sound Support
 Group:          Productivity/Multimedia/Sound/Utilities
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Productivity/Multimedia/Sound/Utilities
 AutoReqProv:    on
 Source:         http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.bz2
diff --git a/bluez.changes b/bluez.changes
index d7bc2ad..709f11e 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 16 09:02:00 CET 2009 - seife@opensuse.org
+
+- update to bluez-4.58:
+  - Fix crash when adapter agent exists during authentication.
+  - Fix CK-20W quirks for play and pause events.
+
 -------------------------------------------------------------------
 Mon Nov  2 21:51:12 CET 2009 - seife@opensuse.org
 
diff --git a/bluez.spec b/bluez.spec
index b9d4ecb..1e3dcfb 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package bluez (Version 4.57)
+# spec file for package bluez (Version 4.58)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,11 +23,11 @@ BuildRequires:  dbus-1-devel flex
 BuildRequires:  glib2-devel libnl-devel libusb-devel
 BuildRequires:  alsa-devel libsndfile-devel pkg-config udev
 Url:            http://www.bluez.org
-Version:        4.57
+Version:        4.58
 Release:        1
 Summary:        Bluetooth Stack for Linux
 Group:          Hardware/Mobile
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Hardware/Mobile
 AutoReqProv:    on
 Source:         http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.bz2
@@ -61,7 +61,7 @@ Authors:
     and others, see AUTHORS
 
 %package devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Files needed for BlueZ development
 Group:          Development/Sources
 Requires:       libbluetooth3 = %{version}
@@ -78,7 +78,7 @@ Authors:
     and others, see AUTHORS
 
 %package -n libbluetooth3
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Bluetooth Libraries
 Group:          Hardware/Mobile
 Provides:       bluez-libs = 3.36
@@ -96,7 +96,7 @@ Authors:
 
 %package cups
 Group:          Hardware/Printing
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        CUPS Driver for Bluetooth Printers
 Requires:       libbluetooth3 = %{version}
 
@@ -113,7 +113,7 @@ Authors:
 
 %package test
 Group:          Development/Tools/Debuggers
-License:        GPL v2 or later ; MIT License (or similar)
+License:        GPLv2+ ; MIT License (or similar)
 Summary:        Tools for testing of various Bluetooth-functions
 Requires:       libbluetooth3 = %{version} python-gobject2 dbus-1-python
 
@@ -130,7 +130,7 @@ Authors:
 
 %package alsa
 Group:          Productivity/Multimedia/Sound/Utilities
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Bluetooth Sound Support
 Requires:       libbluetooth3 = %{version}
 Provides:       bluez-audio:%_libdir/alsa-lib/libasound_module_pcm_bluetooth.so
@@ -149,7 +149,7 @@ Authors:
 
 %package compat
 Group:          Hardware/Mobile
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Bluetooth Stack for Linux
 Requires:       libbluetooth3 = %{version}