diff --git a/open-vm-tools-2010.11.17-327185.tar.bz2 b/open-vm-tools-2010.11.17-327185.tar.bz2
deleted file mode 100644
index 4ebeeb4..0000000
--- a/open-vm-tools-2010.11.17-327185.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78f4b12e7943ac2be4cbca2bf99d6b2f8c69337e8a74eeccf36a2ee36e7d63e3
-size 2502230
diff --git a/open-vm-tools-2010.12.19-339835.tar.bz2 b/open-vm-tools-2010.12.19-339835.tar.bz2
new file mode 100644
index 0000000..ee58300
--- /dev/null
+++ b/open-vm-tools-2010.12.19-339835.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e1d60a21ef573b5b6642c0434e1c01830328b3ce2a95606a3c1fb9e7aa72112
+size 2528090
diff --git a/open-vm-tools.changes b/open-vm-tools.changes
index 6202e42..e66b282 100644
--- a/open-vm-tools.changes
+++ b/open-vm-tools.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Dec 22 08:29:03 UTC 2010 - dimstar@opensuse.org
+
+- Update to version 2010.12.19:
+  + New version of DnD code lands in open-vm-tools. The host part
+    of the new DnD protocol is not available yet in VMware
+    products, though.
+  + vmtoolsd gets some new functionality to support new features
+    being developed internally.
+  + vmxnet driver for FreeBSD fixed to allow changing the MAC
+    address.
+  + lots of bug fixes and other cleanups in various areas.
+- Re-enable building of X dependenices (with_X 1)
+- Disable unity on openSUSE < 11.4. It requires glib >= 2.24.
+
+-------------------------------------------------------------------
+Thu Nov 25 15:11:31 UTC 2010 - dimstar@opensuse.org
+
+- Re-Inject pvscsi for older kernel builds.
+
 -------------------------------------------------------------------
 Mon Nov 22 11:51:35 UTC 2010 - dimstar@opensuse.org
 
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 3eac916..4724ec3 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -31,14 +31,14 @@
 %endif
 
 # X modules are failing all the time the build currently. We need an easy way to enable/disable them.
-%define with_X 0
+%define with_X 1
 
 Name:           open-vm-tools
 Group:          System/Emulators/PC
 Summary:        Open Virtual Machine Tools
-Version:        2010.11.17
+Version:        2010.12.19
 Release:        1
-%define         svn_rev 327185
+%define         svn_rev 339835
 Url:            http://open-vm-tools.sourceforge.net/
 License:        BSD3c ; GPLv2 ; LGPLv2.1
 Source:         %{name}-%{version}-%{svn_rev}.tar.bz2
@@ -54,6 +54,8 @@ Source6:        open-vm-tools-modprobe.conf
 Source7:        vmxnet3.tar.bz2
 # vmmemctl.tar.bz2 is extracted from open-vm-tools 2010.02.23
 Source8:        vmmemctl.tar.bz2
+# pvscsi, extracted from open-vm-tools 2010.03.18
+Source9:        pvscsi.tar.bz2
 Source98:       preamble
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
@@ -173,6 +175,7 @@ if you intend to create own plugins for vmtoolsd.
 pushd modules/linux
 tar xvf %{S:7}
 tar xvf %{S:8}
+tar xvf %{S:9}
 popd
 chmod -x AUTHORS COPYING ChangeLog NEWS README
 # fix for an rpmlint warning regarding wrong line feeds
@@ -185,7 +188,7 @@ sed -i -e "s/\r//" README
 # comments in a continued line seem not to work... shame
 # --disable-unity : liburiparser was not present before 11.0
 %configure \
-%if 0%{?suse_version} < 1100
+%if 0%{?suse_version} < 1140
     --disable-unity \
 %endif
     --without-kernel-modules \
@@ -247,6 +250,9 @@ ln -sf ../../etc/init.d/vmtoolsd $RPM_BUILD_ROOT%{_sbindir}/rcvmtoolsd
 # which checks for /proc/fs/vmblock/dev to appear and then starts vmware-user-suid-wrapper
 install -D -m 0755 %{S:5} $RPM_BUILD_ROOT%{_bindir}/vmware-user-autostart-wrapper
 install -D -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
+# We have our own 'safe' autostart wrapper, which checks for modules to start in autologin mode...
+# Thus we drop the 'original' autostartup
+%__rm %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user.desktop
 
 # handle the .destop files for translations
 %suse_update_desktop_file vmware-user-autostart
@@ -335,9 +341,13 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
 %{_bindir}/vmware-toolbox
-%{_bindir}/vmware-user
 %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper
+%{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so
+%{_libdir}/%{name}/plugins/vmusr/libdndcp.so
 %{_libdir}/%{name}/plugins/vmusr/libresolutionSet.so
+%if 0%{?suse_version} >= 1140
+%{_libdir}/%{name}/plugins/vmusr/libunity.so
+%endif
 %{_libdir}/%{name}/plugins/vmusr/libvixUser.so
 %{_bindir}/vmware-user-autostart-wrapper
 %endif
diff --git a/pvscsi.tar.bz2 b/pvscsi.tar.bz2
new file mode 100644
index 0000000..26fbce5
--- /dev/null
+++ b/pvscsi.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bab6b73130d6a6a66e7549c5c794f016d8ca1267b65dbf4ce0f1a2b57214559
+size 41129