diff --git a/kernel-modules-nvidia.spec b/kernel-modules-nvidia.spec
index 138bd78..e8ea5b6 100644
--- a/kernel-modules-nvidia.spec
+++ b/kernel-modules-nvidia.spec
@@ -5,6 +5,7 @@
 
 %define module_name	nvidia
 %define kmsmodule_name	nvidia-modeset
+%define uvmmodule_name	nvidia-uvm
 %define module_version	361.28
 %define module_release	alt1
 %define flavour		@kflavour@
@@ -150,12 +151,24 @@ do
 	TEMP_DIR=$PWD/ \
 	ARCH=%base_arch \
 	SYSSRC=%_usrsrc/linux-%kversion-%flavour
+	if [ -d uvm ] ; then
+	pushd uvm
+	cp ../Module.symvers ./
+	%make_build modules \
+	$INTO_KERNEL_SRCDIR \
+	SUBDIRS=$PWD \
+	TEMP_DIR=$PWD/ \
+	ARCH=%base_arch \
+	SYSSRC=%_usrsrc/linux-%kversion-%flavour
+	popd
+	fi
     popd
 done
 
 %install
 mkdir -p %buildroot/%module_dir
 mkdir -p %buildroot/%module_local_dir
+mkdir -p %buildroot/%module_local_dir-uvm
 mkdir -p %buildroot/%module_version_dir
 mkdir -p %buildroot/%nvidia_workdir
 
@@ -166,14 +179,20 @@ do
     install -p -m644 %module_name%module_ext %buildroot/%module_local_dir/%kversion-%flavour-%krelease-$ver
     [ -e %module_name-modeset%module_ext ] &&
 	install -p -m644 %module_name-modeset%module_ext %buildroot/%module_local_dir/modeset-%kversion-%flavour-%krelease-$ver
+    [ -e uvm/%module_name-uvm%module_ext ] &&
+	install -p -m644 uvm/%module_name-uvm%module_ext %buildroot/%module_local_dir/uvm-%kversion-%flavour-%krelease-$ver
+    [ -e %module_name-uvm%module_ext ] &&
+	install -p -m644 %module_name-uvm%module_ext %buildroot/%module_local_dir/uvm-%kversion-%flavour-%krelease-$ver
     popd
 done
 
 echo -n "%version" >%buildroot/%nvidia_workdir/%kversion-%flavour-%krelease
 ln -s %nvidia_workdir/%kversion-%flavour-%krelease %buildroot/%module_version_dir/%module_name
 ln -s nvidia %buildroot/%module_version_dir/%kmsmodule_name
+ln -s nvidia %buildroot/%module_version_dir/%uvmmodule_name
 ln -s %module_local_dir/%kversion-%flavour-%krelease-%version %buildroot/%module_dir/%module_name%module_ext
 ln -s %module_local_dir/modeset-%kversion-%flavour-%krelease-%version %buildroot/%module_dir/%kmsmodule_name%module_ext
+ln -s %module_local_dir/uvm-%kversion-%flavour-%krelease-%version %buildroot/%module_dir/%uvmmodule_name%module_ext
 
 
 %post
@@ -206,8 +225,10 @@ fi
 %module_dir
 %module_version_dir/%module_name
 %module_version_dir/%kmsmodule_name
+%module_version_dir/%uvmmodule_name
 %module_local_dir/%kversion-%flavour-%krelease-*
 %module_local_dir/modeset-%kversion-%flavour-%krelease-*
+%module_local_dir/uvm-%kversion-%flavour-%krelease-*
 %config(noreplace) %nvidia_workdir/%kversion-%flavour-%krelease
 
 %changelog