diff --git a/.cvsignore b/.cvsignore
index 072d977..2fdabf6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LVM2.2.00.08.tgz
+LVM2.2.00.15.tgz
diff --git a/lvm2.spec b/lvm2.spec
index ed88303..baa2d63 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,67 +1,100 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.00.08
-Release: 5
+Version: 2.00.15
+Release: 2
 License: GPL
 Group: System Environment/Base
-URL: http://www.sistina.com
+URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
-Patch0: lvm2-blksize64.patch
-Patch1: lvm2-static.patch
-Patch2: lvm2-sysfs-filter.patch
-Patch3: lvm2-Makefile-nonroot.patch
-Patch4: lvm2-selinux.patch
+Patch0: lvm2-selinux-disabled.patch
+Patch1: lvm2-i2o.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper, autoconf
+BuildRequires: device-mapper
+BuildRequires: readline-devel
+BuildRequires: libselinux-devel
+Conflicts: lvm < 1.0.3-19
+
+%define _exec_prefix /usr
 
 %description
 
 %prep
 %setup -q -n LVM2.%{version}
-%patch0 -p1 -b .blksize64
-%patch1 -p1 -b .static
-# Limit "lvm vgscan" to block devices visible in /sys/block/
-%patch2 -p1 -b .sysfs
-# Allow non-root users to build RPM
-%patch3 -p1 -b .nonroot
-# Set SELinux contexts on device nodes we create
-%patch4 -p1 -b .selinux
+%patch0 -p1
+%patch1 -p1
 
 %build
-# needed for patch4 (selinux support)
-autoconf
-%configure  --sbindir=/sbin --libdir=/%{_lib}
-make
-mv tools/lvm tools/lvm.dyn
-
-# now do a static build
-make clean
-%configure  --sbindir=/sbin --libdir=/%{_lib} --enable-static_link
-make
-(cd tools; make lvm.static)
-
-mv tools/lvm.dyn tools/lvm
+%configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-staticdir=/sbin --with-user= --with-group=
+make DESTDIR=$RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/sbin
-mv $RPM_BUILD_ROOT/usr/sbin/lvm $RPM_BUILD_ROOT/sbin/lvm
-mv $RPM_BUILD_ROOT/usr/sbin/lvm.static $RPM_BUILD_ROOT/sbin/lvm.static
+# Temporary links until initscripts get updated to use lvm.static
+ln -s lvm.static $RPM_BUILD_ROOT/sbin/lvm
+ln -s lvm.static $RPM_BUILD_ROOT/sbin/pvscan
+ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgchange
+ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgscan
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB README VERSION WHATS_NEW
-/sbin/lvm
+%doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW
 /sbin/lvm.static
+/sbin/lvm
+/sbin/pvscan
+/sbin/vgchange
+/sbin/vgscan
+/usr/sbin/lvm
+/usr/sbin/*
 %{_mandir}/*/*
-
+%config(noreplace) /etc/lvm/lvm.conf
 
 %changelog
+* Thu May 06 2004 Warren Togami <wtogami@redhat.com> - 2.00.15-2
+- i2o patch from Markus Lidel
+
+* Tue Apr 20 2004 Bill Nottingham <notting@redhat.com> - 2.00.15-1.1
+- handle disabled SELinux correctly, so that LVMs can be detected in a
+  non-SELinux context
+  
+* Mon Apr 19 2004 Alasdair Kergon <agk@redhat.com> - 2.00.15-1
+- Fix non-root build with current version of 'install'.
+
+* Fri Apr 16 2004 Alasdair Kergon <agk@redhat.com> - 2.00.14-1
+- Use 64-bit file offsets.
+
+* Fri Apr 16 2004 Alasdair Kergon <agk@redhat.com> - 2.00.13-1
+- Avoid scanning devices containing md superblocks.
+- Integrate ENOTSUP patch.
+
+* Thu Apr 15 2004 Jeremy Katz <katzj@redhat.com> - 2.00.12-4
+- don't die if we get ENOTSUP setting selinux contexts
+
+* Thu Apr 15 2004 Alasdair Kergon <agk@redhat.com> 2.00.12-3
+- Add temporary pvscan symlink for LVM1 until mkinitrd gets updated.
+
+* Wed Apr 14 2004 Alasdair Kergon <agk@redhat.com> 2.00.12-2
+- Mark config file noreplace.
+
+* Wed Apr 14 2004 Alasdair Kergon <agk@redhat.com> 2.00.12-1
+- Install default /etc/lvm/lvm.conf.
+- Move non-static binaries to /usr/sbin.
+- Add temporary links in /sbin to lvm.static until rc.sysinit gets updated.
+
+* Thu Apr 08 2004 Alasdair Kergon <agk@redhat.com> 2.00.11-1
+- Fallback to using LVM1 tools when using a 2.4 kernel without device-mapper.
+
+* Wed Apr 07 2004 Alasdair Kergon <agk@redhat.com> 2.00.10-2
+- Install the full toolset, not just 'lvm'.
+
+* Wed Apr 07 2004 Alasdair Kergon <agk@redhat.com> 2.00.10-1
+- Update to version 2.00.10, which incorporates the RH-specific patches
+  and includes various fixes and enhancements detailed in WHATS_NEW.
+
 * Wed Mar 17 2004 Jeremy Katz <katzj@redhat.com> 2.00.08-5
 - Fix sysfs patch to find sysfs
 - Take patch from dwalsh and tweak a little for setting SELinux contexts on
diff --git a/sources b/sources
index 494274f..3d06635 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed973eda318f3685ad317afb9a54c571  LVM2.2.00.08.tgz
+9b8496b17e6606de662fbbb90520ba33  LVM2.2.00.15.tgz