diff --git a/package/base/device-mapper/device-mapper.desc b/package/base/device-mapper/device-mapper.desc
index 1169f616e..c4f0aafe6 100644
--- a/package/base/device-mapper/device-mapper.desc
+++ b/package/base/device-mapper/device-mapper.desc
@@ -38,8 +38,8 @@
 
 [L] GPL
 [S] Stable
-[V] 1.02.03 1
+[V] 1.02.10
 [P] X -?-3-----9 184.500
 
-[D] 1209628962 device-mapper.1.02.03.tgz ftp://sources.redhat.com/pub/dm/
+[D] 2218004631 device-mapper.1.02.10.tgz ftp://sources.redhat.com/pub/dm/
 
diff --git a/package/base/lvm-wrapper/lvm-wrapper.desc b/package/base/lvm-wrapper/lvm-wrapper.desc
index 2b35b4c2e..6410c4640 100644
--- a/package/base/lvm-wrapper/lvm-wrapper.desc
+++ b/package/base/lvm-wrapper/lvm-wrapper.desc
@@ -36,5 +36,5 @@
 [L] GPL
 [S] Stable
 [V] 1.0
-[P] X ---3-----9 228.200
+[P] O ---3-----9 228.200
 
diff --git a/package/base/lvm/lvm.desc b/package/base/lvm/lvm.desc
index 25ca6152c..308ccf8b2 100644
--- a/package/base/lvm/lvm.desc
+++ b/package/base/lvm/lvm.desc
@@ -42,7 +42,7 @@
 [L] GPL
 [S] Stable
 [V] 1.0.8
-[P] X -?-3-----9 184.800
+[P] O -?-3-----9 184.800
 
 [D] 2973295892 lvm_1.0.8.tar.gz ftp://linux.msede.com/lvm/1.0/
 
diff --git a/package/base/lvm2/linux-2.6.10-fs_h.patch b/package/base/lvm2/linux-2.6.10-fs_h.patch
deleted file mode 100644
index 52f67ccec..000000000
--- a/package/base/lvm2/linux-2.6.10-fs_h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/lvm2/linux-2.6.10-fs_h.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -dur LVM2.2.00.25/lib/device/dev-io.c src.lvm2.1104330759.23110.469340415/LVM2.2.00.25/lib/device/dev-io.c
---- LVM2.2.00.25/lib/device/dev-io.c	2004-09-14 22:23:23.000000000 +0000
-+++ src.lvm2.1104330759.23110.469340415/LVM2.2.00.25/lib/device/dev-io.c	2004-12-29 14:42:55.934962456 +0000
-@@ -31,7 +31,11 @@
- #  define u64 uint64_t		/* Missing without __KERNEL__ */
- #  undef WNOHANG		/* Avoid redefinition */
- #  undef WUNTRACED		/* Avoid redefinition */
--#  include <linux/fs.h>		/* For block ioctl definitions */
-+/* copied from: <linux/fs.h> */	/* For block ioctl definitions */
-+#  define BLKBSZGET  _IOR(0x12,112,size_t)
-+#  define BLKSSZGET  _IO(0x12,104)/* get block device sector size */
-+#  define BLKFLSBUF  _IO(0x12,97)	/* flush buffer cache */
-+
- #  define BLKSIZE_SHIFT SECTOR_SHIFT
- #  ifndef BLKGETSIZE64		/* fs.h out-of-date */
- #    define BLKGETSIZE64 _IOR(0x12, 114, size_t)
diff --git a/package/base/lvm2/lvm2.conf b/package/base/lvm2/lvm2.conf
index 5095153d9..bb58d0edd 100644
--- a/package/base/lvm2/lvm2.conf
+++ b/package/base/lvm2/lvm2.conf
@@ -21,9 +21,13 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 srcdir="LVM2.$ver"
-var_append confopt " " "--sbindir=$root/lib/lvm2"
-var_append confopt " " "--bindir=$root/lib/lvm2"
-var_append confopt " " "--libdir=$root/lib"
+if pkginstalled lvm-wrapper ; then
+	var_append confopt " " "--sbindir=$root/lib/lvm2"
+	var_append confopt " " "--bindir=$root/lib/lvm2"
+	var_append confopt " " "--libdir=$root/lib"
+else
+	[ "$root/$prefix" = "/usr" ] && confopt=""
+fi
 
 if [ "$ROCKCFG_LVM_MANPAGES" != "lvm2" ] ; then
 	var_append confopt " " "--mandir=$builddir/trash/man"
diff --git a/package/base/lvm2/lvm2.desc b/package/base/lvm2/lvm2.desc
index 32808dfbd..a7a7753e4 100644
--- a/package/base/lvm2/lvm2.desc
+++ b/package/base/lvm2/lvm2.desc
@@ -43,8 +43,8 @@
 
 [L] GPL
 [S] Stable
-[V] 2.02.02
+[V] 2.02.10
 [P] X -?-3-----9 184.900
 
-[D] 1863002475 LVM2.2.02.02.tgz ftp://sources.redhat.com/pub/lvm2/
+[D] 60647899 LVM2.2.02.10.tgz ftp://sources.redhat.com/pub/lvm2/