diff --git a/LVM2.2.02.17.tar.bz2 b/LVM2.2.02.17.tar.bz2
deleted file mode 100644
index 28d9613..0000000
--- a/LVM2.2.02.17.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e9e3a51a49b76aece64da4770dc2b1bc1a9b7a70ae9bcf0836c0f6cc5a6b8db
-size 402504
diff --git a/LVM2.2.02.25.tar.bz2 b/LVM2.2.02.25.tar.bz2
new file mode 100644
index 0000000..b1651f2
--- /dev/null
+++ b/LVM2.2.02.25.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d521d2bb70718403ca1b9876142bf9617470a82cd00f5407efe455ad07321be4
+size 407867
diff --git a/fix_pointer_arithmetic.diff b/fix_pointer_arithmetic.diff
deleted file mode 100644
index dec1041..0000000
--- a/fix_pointer_arithmetic.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/device/device.c
-+++ lib/device/device.c	2007/01/08 15:11:19
-@@ -72,7 +72,7 @@
- 	/* Check for msdos partition table */
- 	part_magic = buf + PART_MAGIC_OFFSET/sizeof(buf[0]);
- 	if ((*part_magic == xlate16(PART_MAGIC))) {
--		part = (struct partition *) (buf + PART_OFFSET);
-+		part = (struct partition *) (((unsigned char*)buf) + PART_OFFSET);
- 		for (p = 0; p < 4; p++, part++) {
- 			/* Table is invalid if boot indicator not 0 or 0x80 */
- 			if ((part->boot_ind & 0x7f)) {
diff --git a/fix_striped_old_format.diff b/fix_striped_old_format.diff
deleted file mode 100644
index 23a0909..0000000
--- a/fix_striped_old_format.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/format1/import-extents.c
-+++ lib/format1/import-extents.c	2005/11/07 18:25:05
-@@ -289,7 +289,7 @@
- 		 * and so can form part of this segment
- 		 */
- 		while (_check_stripe(lvm, lvm->stripes,
--				     area_len * lvm->stripes, le, len))
-+				     area_len, le, len))
- 			area_len++;
- 
- 		if (!(seg = alloc_lv_segment(cmd->mem, segtype, lvm->lv,
-@@ -315,7 +315,7 @@
- 
- 		list_add(&lvm->lv->segments, &seg->list);
- 
--		le += seg->len;
-+		le += seg->len/lvm->stripes;
- 	}
- 
- 	return 1;
diff --git a/lvm2.changes b/lvm2.changes
index 1c0d3db..4e0d20d 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon May  7 14:02:16 CEST 2007 - fehr@suse.de
+
+- update to new version 2.02.25
+  Add devices/preferred_names config regex list for displayed device names
+  Update pvck to include text metadata area and record detection
+  Fix creation and conversion of mirrors with tags
+  Fix vgsplit for lvm1 format (set and validate VG name in PVs metadata)
+  Split metadata areas in vgsplit properly
+  Fix vgremove to require at least one vg argument
+  Fix reading of striped LVs in LVM1 format
+  Fix vgsplit to handle mirrors
+  Fix md signature check to handle both endiannesses
+  Add devices/ignore_suspended_devices to ignore suspended dm devices
+
 -------------------------------------------------------------------
 Tue Feb 20 16:57:34 CET 2007  - fehr@suse.de
 
diff --git a/lvm2.spec b/lvm2.spec
index f52ed01..84db8e6 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package lvm2 (Version 2.02.17)
+# spec file for package lvm2 (Version 2.02.25)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -20,20 +20,18 @@ Obsoletes:      lvm
 PreReq:         %fillup_prereq %insserv_prereq
 %endif
 Autoreqprov:    on
-Version:        2.02.17
-Release:        11
+Version:        2.02.25
+Release:        1
 Summary:        LVM2 Tools
 Source:         LVM2.%{version}.tar.bz2
 Source1:        lvm.conf
 Source2:        boot.lvm
 Source3:        sysconfig.lvm
 Patch:          improve_probing.diff
-Patch1:         fix_pointer_arithmetic.diff
 Patch2:         no-inc-audit.diff
 Patch3:         no_buildroot_shared.diff
 Patch4:         sys_mount_instead_linux_fs.diff
 Patch5:         pvscan_2TB_limit.diff
-Patch9:         fix_striped_old_format.diff
 Patch10:        lvm-no_chown.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -46,12 +44,10 @@ Volume Manager.
 %prep
 %setup -n LVM2.%{version}
 %patch
-%patch1
 %patch2
 %patch3
 %patch4
 %patch5
-%patch9
 %patch10
 
 %build
@@ -113,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/lvs
 /sbin/lvscan
 /sbin/pvchange
+/sbin/pvck
 /sbin/pvcreate
 /sbin/pvdisplay
 /sbin/pvmove
@@ -155,6 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/lvs.8.gz
 %{_mandir}/man8/lvscan.8.gz
 %{_mandir}/man8/pvchange.8.gz
+%{_mandir}/man8/pvck.8.gz
 %{_mandir}/man8/pvcreate.8.gz
 %{_mandir}/man8/pvdisplay.8.gz
 %{_mandir}/man8/pvmove.8.gz
@@ -182,6 +180,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vgsplit.8.gz
 
 %changelog
+* Mon May 07 2007 - fehr@suse.de
+- update to new version 2.02.25
+  Add devices/preferred_names config regex list for displayed device names
+  Update pvck to include text metadata area and record detection
+  Fix creation and conversion of mirrors with tags
+  Fix vgsplit for lvm1 format (set and validate VG name in PVs metadata)
+  Split metadata areas in vgsplit properly
+  Fix vgremove to require at least one vg argument
+  Fix reading of striped LVs in LVM1 format
+  Fix vgsplit to handle mirrors
+  Fix md signature check to handle both endiannesses
+  Add devices/ignore_suspended_devices to ignore suspended dm devices
 * Tue Feb 20 2007 - fehr@suse.de
 - add boot.dmraid to Should-Start in boot.lvm2
 * Sun Feb 11 2007 - ro@suse.de