Index: SPECS/nvidia-current.spec
===================================================================
--- SPECS/nvidia-current.spec	(revision 642214)
+++ SPECS/nvidia-current.spec	(working copy)
@@ -744,15 +744,17 @@
 # modprobe.conf
 install -d -m755			%{buildroot}%{_sysconfdir}/modprobe.d
 touch					%{buildroot}%{_sysconfdir}/modprobe.d/display-driver.conf
-echo "alias nvidia %{modulename}" 	>  %{buildroot}%{_sysconfdir}/%{drivername}/modprobe.conf
-echo "blacklist nouveau"		>> %{buildroot}%{_sysconfdir}/%{drivername}/modprobe.conf
+echo "install nvidia /sbin/modprobe %{modulename} \$CMDLINE_OPTS" > %{buildroot}%{_sysconfdir}/%{drivername}/modprobe.conf
 
+%if %{mdkversion} < 201100
 # modprobe.preload.d
 # This is here because sometimes (one case reported by Christophe Fergeau on 04/2010)
 # starting X server fails if the driver module is not already loaded.
+# This is fixed by the reworked kms-dkms-plymouth-drakx-initrd system in 2011.0.
 install -d -m755			%{buildroot}%{_sysconfdir}/modprobe.preload.d
 touch					%{buildroot}%{_sysconfdir}/modprobe.preload.d/display-driver
 echo "%{modulename}"			>  %{buildroot}%{_sysconfdir}/%{drivername}/modprobe.preload
+%endif
 
 # XvMCConfig
 install -d -m755 %{buildroot}%{_sysconfdir}/%{drivername}
@@ -827,7 +829,9 @@
 	--slave %{_sysconfdir}/X11/xinit.d/nvidia-settings.xinit nvidia-settings.xinit %{_sysconfdir}/%{drivername}/nvidia-settings.xinit \
 	--slave %{_libdir}/vdpau/libvdpau_nvidia.so.1 %{_lib}vdpau_nvidia.so.1 %{nvidia_libdir}/vdpau/libvdpau_nvidia.so.%{version} \
 	--slave %{_sysconfdir}/modprobe.d/display-driver.conf display-driver.conf %{_sysconfdir}/%{drivername}/modprobe.conf \
+%if %{mdkversion} < 201100
 	--slave %{_sysconfdir}/modprobe.preload.d/display-driver display-driver.preload %{_sysconfdir}/%{drivername}/modprobe.preload \
+%endif
 	--slave %{_sysconfdir}/OpenCL/vendors/nvidia.icd nvidia.icd %{_sysconfdir}/%{drivername}/nvidia.icd \
 %ifarch %{biarches}
 	--slave %{_prefix}/lib/vdpau/libvdpau_nvidia.so.1 libvdpau_nvidia.so.1 %{nvidia_libdir32}/vdpau/libvdpau_nvidia.so.%{version} \
@@ -910,10 +914,14 @@
 %ghost %{_sysconfdir}/ld.so.conf.d/GL.conf
 %ghost %{_sysconfdir}/X11/xinit.d/nvidia-settings.xinit
 %ghost %{_sysconfdir}/modprobe.d/display-driver.conf
+%if %{mdkversion} < 201100
 %ghost %{_sysconfdir}/modprobe.preload.d/display-driver
+%endif
 %dir %{_sysconfdir}/%{drivername}
 %{_sysconfdir}/%{drivername}/modprobe.conf
+%if %{mdkversion} < 201100
 %{_sysconfdir}/%{drivername}/modprobe.preload
+%endif
 %{_sysconfdir}/%{drivername}/ld.so.conf
 %{_sysconfdir}/%{drivername}/XvMCConfig
 %{_sysconfdir}/%{drivername}/nvidia-settings.xinit