diff --git a/open-vm-tools-modprobe.conf b/open-vm-tools-modprobe.conf
new file mode 100644
index 0000000..a924f6f
--- /dev/null
+++ b/open-vm-tools-modprobe.conf
@@ -0,0 +1,2 @@
+install pcnet32 /sbin/modprobe -q --ignore-install vmxnet; /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS; /bin/true;
+
diff --git a/open-vm-tools.changes b/open-vm-tools.changes
index cd3d4ee..0cedb09 100644
--- a/open-vm-tools.changes
+++ b/open-vm-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 23 09:27:23 UTC 2010 - dimstar@opensuse.org
+
+- Disabled vmxnet3 building. this only did not give an error anyhow
+  as there was a typo, thus having the module already disabled for
+  quite some time.
+- bnc#590329: Re-add lost 50-vmnics.conf file.
+
 -------------------------------------------------------------------
 Thu Feb 25 20:42:39 UTC 2010 - dominique.leuenberger@tmf-group.com
 
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 5b90df2..0d9fc16 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -24,7 +24,7 @@ Name:           open-vm-tools
 Group:          System/Emulators/PC
 Summary:        Open Virtual Machine Tools
 Version:        2010.02.23
-Release:        1
+Release:        2
 %define         svn_rev 236320
 Url:            http://open-vm-tools.sourceforge.net/
 License:        BSD3c ; GPLv2 ; LGPLv2.1
@@ -34,6 +34,7 @@ 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
 Source98:       preamble
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
@@ -59,9 +60,6 @@ ExclusiveArch:  %ix86 x86_64
 Requires:       vmware-guest-kmp
 Supplements:    modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
 %define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet vmci vsock pvscsi
-%if 0%{suse_version} <= 1120
-%define vm_module %{vm_modules} vmxnet3
-%endif
 
 %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
 
@@ -214,6 +212,7 @@ 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
+install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.conf
 
 # handle the .destop files for translations
 %suse_update_desktop_file vmware-user-autostart
@@ -284,6 +283,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/pam.d/vmtoolsd
 %{_sysconfdir}/vmware-tools
 %{_sysconfdir}/init.d/vmtoolsd
+%{_sysconfdir}/modprobe.d/50-vmnics.conf
 %{_sbindir}/rcvmtoolsd
 %exclude %{_libdir}/*.so