diff --git a/_service b/_service
new file mode 100644
index 0000000..7ea108b
--- /dev/null
+++ b/_service
@@ -0,0 +1,11 @@
+<services>
+  <service name="download_url">
+    <param name="protocol">http</param>
+    <param name="host">sourceforge.net</param>
+    <param name="path">/projects/open-vm-tools/files/open-vm-tools/2011.04.25/open-vm-tools-2011.04.25-402641.tar.gz</param>
+  </service>
+  <service name="recompress">
+    <param name="file">_service:download_url:*.tar.gz</param>
+    <param name="compression">bz2</param>
+  </service>
+</services>
diff --git a/_service:recompress:download_url:open-vm-tools-2011.04.25-402641.tar.bz2 b/_service:recompress:download_url:open-vm-tools-2011.04.25-402641.tar.bz2
new file mode 100644
index 0000000..dfa4204
--- /dev/null
+++ b/_service:recompress:download_url:open-vm-tools-2011.04.25-402641.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6724632168332df1816f0d7e1b1c1d1523e4a4ddbe4b75173dc6c71ea90a98b9
+size 2577538
diff --git a/open-vm-tools-2011.03.28-387002.tar.bz2 b/open-vm-tools-2011.03.28-387002.tar.bz2
deleted file mode 100644
index d6dcd8c..0000000
--- a/open-vm-tools-2011.03.28-387002.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:edcd0bcef2d27d81dc4b811697735f51856956cc63ee07660555842102b2f143
-size 2582399
diff --git a/open-vm-tools.changes b/open-vm-tools.changes
index 121855a..401e43c 100644
--- a/open-vm-tools.changes
+++ b/open-vm-tools.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 29 16:08:33 UTC 2011 - dimstar@opensuse.org
+
+- Udpate to version 2011.04.25:
+  + Mostly cleanups and small bug fixes in this release.
+  + Logging is enabled by default in vmtoolsd, writing to syslog.
+    The default log level is not chatty, so few messages should
+    make it to syslog during normal operation.
+  + The GUI version of the toolbox was removed.
+
 -------------------------------------------------------------------
 Wed Apr 27 08:58:46 UTC 2011 - dimstar@opensuse.org
 
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index ecd4e5b..75f6155 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -32,15 +32,14 @@
 Name:           open-vm-tools
 Group:          System/Emulators/PC
 Summary:        Open Virtual Machine Tools
-Version:        2011.03.28
+Version:        2011.04.25
 Release:        1
-%define         svn_rev 387002
+%define         svn_rev 402641
 Url:            http://open-vm-tools.sourceforge.net/
 License:        BSD3c ; GPLv2 ; LGPLv2.1
 Source:         %{name}-%{version}-%{svn_rev}.tar.bz2
 Source1:        vmtoolsd
 Source2:        vmware-user-autostart.desktop
-Source3:        vmware-toolbox.desktop
 Source4:        open-vm-tools.permissions
 Source5:        vmware-user-autostart-wrapper
 Source6:        open-vm-tools-modprobe.conf
@@ -321,7 +320,6 @@ rm -rf %{buildroot}
 %files gui
 %defattr(-, root, root)
 %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
-%{_bindir}/vmware-toolbox
 %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper
 %{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so
 %{_libdir}/%{name}/plugins/vmusr/libdndcp.so
diff --git a/vmtoolsd b/vmtoolsd
index 0a1084d..a8d759e 100644
--- a/vmtoolsd
+++ b/vmtoolsd
@@ -43,10 +43,10 @@ test -x $VMTOOLSD_BIN || { echo "$VMTOOLSD_BIN not installed";
 # The kernel module for the balloon driver changes its name in different kernel versions
 KERNEL_MICRO=$(uname -r | awk -F- '{print $1}' | sed 's,2.6.,,')
 case $KERNEL_MICRO in
-        36)
+        27|28|29|30|31|32|33)
                 VMBALLOON=vmmemctl
                 ;;
-        37)
+        34|35)
                 VMBALLOON=vmware_balloon
                 ;;
         *)
diff --git a/vmware-toolbox.desktop b/vmware-toolbox.desktop
deleted file mode 100644
index ce97167..0000000
--- a/vmware-toolbox.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=VMware Toolbox
-GenericName=System Monitor
-Comment=VMware Guest Toolbox
-Exec=vmware-toolbox
-Icon=vmware-toolbox
-Terminal=false
-Type=Application
-Categories=System;Monitor;
-StartupNotify=false