diff --git a/.cvsignore b/.cvsignore
index 8faa86e..1b718ad 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,25 +1,6 @@
-VirtIOPDBs.zip
-viostorPDBs.zip
-virtio-win-1.0.0-31351-prewhql.zip
-virtio-win-1.0.0-31351.tar.bz2
-virtio-win-1.0.0-31351-package.log
-virtio-win-1.0.0-31351-build.log
-virtio-win-1.0.0-31351-bin.tar.bz2
-virtio-win-1.0.0-31351.1.tar.bz2
-virtio-win-1.0.0-31351-bin-whql.tar.bz2
-virtio-win-31351-package-whql.log
-virtio-win-1.0.0-31351.1-bin-whql.tar.bz2
-virtio-win-37540-package-whql.log
-virtio-win-1.0.0-37540-bin-whql.tar.bz2
-virtio-win-1.0.0-37540.tar.bz2
-virtio-win-39539-package-whql.log
-virtio-win-1.0.0-39539.tar.bz2
-virtio-win-1.0.0-39539-bin-whql.tar.bz2
-viostorPDBs-41879.zip
-VirtIOPDBs-41879.zip
-virtio-win-1.0.0-41879-bin-whql.tar.bz2
-virtio-win-1.0.0-41879-build.log
-virtio-win-1.0.0-41879-package-whql.log
-virtio-win-1.0.0-41879-prewhql.zip
-virtio-win-1.0.0-41879.tar.bz2
-virtio-win-drivers-1.0.0-41879-whql.zip
+virtio-win-1.1.16-drivers.zip
+virtio-win-1.1.16-pdbs.zip
+virtio-win-1.1.16-prewhql.zip
+virtio-win-1.1.16.tar.bz2
+virtio-win-1.1.16-bin-whql.tar.bz2
+virtio-win-1.1.16-build.log
diff --git a/sources b/sources
index ff0975b..60609c9 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,6 @@
-f53ce623e7b3250506934e10d34dee04  viostorPDBs-41879.zip
-073c8f70976f002d6d4c56a68b44ce04  VirtIOPDBs-41879.zip
-a60af264a4255774e34aefe1bf28e488  virtio-win-1.0.0-41879-bin-whql.tar.bz2
-6b408056cd30dda7df06b63ba6b374d2  virtio-win-1.0.0-41879-build.log
-709fdca3709315d6d07467aed9816613  virtio-win-1.0.0-41879-package-whql.log
-0554e1d1f4d13e985001cc94764a39ec  virtio-win-1.0.0-41879-prewhql.zip
-ad687436a6370477ff9e8a1da6a899cc  virtio-win-1.0.0-41879.tar.bz2
-454c63c652ada3a6941b9d8ae4385d97  virtio-win-drivers-1.0.0-41879-whql.zip
+a676c25fff14fc38e6af438938886ca6  virtio-win-1.1.16-drivers.zip
+8f1d70a5b34427a61e45ad6053b5f47a  virtio-win-1.1.16-pdbs.zip
+2149f529324a860667bd373a665f60ce  virtio-win-1.1.16-prewhql.zip
+692fea60120d7d17b46cd5c7ca55f065  virtio-win-1.1.16.tar.bz2
+47630625f96cbb98fe290969b311a9df  virtio-win-1.1.16-bin-whql.tar.bz2
+4e055e48ce8eb3f0639b303dfd552edd  virtio-win-1.1.16-build.log
diff --git a/virtio-win.spec b/virtio-win.spec
index 4fc8f8e..19b335a 100644
--- a/virtio-win.spec
+++ b/virtio-win.spec
@@ -1,15 +1,15 @@
-%global svnnum 41879
+%global gitrev mm16
 
 Summary: VirtIO para-virtualized drivers for Windows(R)
 Name: virtio-win
-Version: 1.0.0
-Release: 8.3.%{svnnum}%{?dist}
+Version: 1.1.16
+Release: 0%{?dist}
 License: Red Hat Proprietary
 Group: Applications/System
 URL: http://www.redhat.com/
-Source0: %{name}-%{version}-%{svnnum}.tar.bz2
-Source1: %{name}-%{version}-%{svnnum}-bin-whql.tar.bz2
-Source2: %{name}-drivers-%{version}-%{svnnum}-whql.zip
+Source0: %{name}-%{version}.tar.bz2
+Source1: %{name}-%{version}-bin-whql.tar.bz2
+Source2: %{name}-%{version}-drivers.zip
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires:  /usr/bin/mkisofs
@@ -19,15 +19,12 @@ VirtIO para-virtualized Windows(R) drivers for 32-bit and 64-bit
 Windows(R) guests.
 
 %prep
-%setup -q -T -b 1 -n %{name}-%{version}-%{svnnum}
-%setup -q -T -a 2 -n %{name}-%{version}-%{svnnum} -D
+%setup -q -T -b 1 -n %{name}-%{version}
+%setup -q -T -a 2 -n %{name}-%{version} -D
 
 %build
-%{__rm} -rf iso-build
-%{__mkdir} iso-build
-%{__cp} -p *.msi iso-build
 /usr/bin/mkisofs -o %{name}-%{version}.iso -r -J -input-charset iso8859-1 \
-  -V "%{name}-%{version}-%{release}" iso-build
+  -V "%{name}-%{version}" .
 
 %install
 %{__rm} -rf %{buildroot}
@@ -36,10 +33,8 @@ Windows(R) guests.
 %{__install} -d -m0755 %{buildroot}%{_datadir}/%{name}
 %{__install} -p -m0644 %{name}-%{version}.iso %{buildroot}%{_datadir}/%{name}
 %{__ln_s} %{name}-%{version}.iso %{buildroot}%{_datadir}/%{name}/%{name}.iso
-for file in *.vfd; do
-  %{__install} -p -m0644 $file %{buildroot}%{_datadir}/%{name}/${file/.vfd/-%{version}.vfd}
-  %{__ln_s} ${file/.vfd/-%{version}.vfd} %{buildroot}%{_datadir}/%{name}/$file
-done
+%{__install} -p -m0644 %{name}-%{version}.vfd  %{buildroot}%{_datadir}/%{name}
+%{__ln_s} %{name}-%{version}.vfd %{buildroot}%{_datadir}/%{name}/%{name}.vfd
 %{__cp} -a drivers %{buildroot}/%{_datadir}/%{name}
 
 %clean
@@ -55,11 +50,8 @@ done
 %{_datadir}/%{name}/drivers
 
 %changelog
-* Wed Aug 11 2010 Mike Bonnet <mikeb@redhat.com> - 1.0.0-8.3.41879
-- add driver files under /usr/share/virtio-win/drivers
-
-* Tue Jul 6 2010 Jay Greguske Greguske <jgregusk@redhat.com> 1.0.0-8.2.41879
-- Fixed license field
+* Fri Jul 2 2010 Jay Greguske <jgregusk@redhat.com> - 1.1.16-0
+- RHEL 6 rebuild with new drivers
 
 * Thu May 13 2010 Dennis Gregorovic <dgregor@redhat.com> - 1.0.0-8.1.41879
 - Bump for rebuild