diff --git a/srcpkgs/lvm2/device-mapper.template b/srcpkgs/lvm2/device-mapper.template
index 3ef7426af5a..c8fdfc07b46 100644
--- a/srcpkgs/lvm2/device-mapper.template
+++ b/srcpkgs/lvm2/device-mapper.template
@@ -5,8 +5,8 @@ long_desc="
  This package contains the supporting userspace utility, dmsetup,
  for the kernel device-mapper and its required library, libdevmapper."
 
-replaces="lvm2-device-mapper>=0"
-revision=2
+replaces="lvm2<2.02.95_3"
+revision=3
 
 do_install() {
 	vmove "usr/sbin/dm*" usr/sbin
@@ -14,4 +14,9 @@ do_install() {
 	vmove "usr/lib/liblvm2cmd.so*" usr/lib
 	vmove "usr/share/man/man8/dm*" usr/share/man/man8
 	vmove usr/lib/device-mapper usr/lib
+	for f in 10-dm 13-dm-disk 95-dm-notify; do
+		vmove lib/udev/rules.d/${f}.rules 644 lib/udev/rules.d
+	done
+	vinstall ${FILESDIR}/11-dm-initramfs.rules 644 \
+		usr/share/initramfs-tools/udev-rules
 }
diff --git a/srcpkgs/lvm2/files/lvm2.initramfs-hook b/srcpkgs/lvm2/files/lvm2.initramfs-hook
index c7059c59ab5..5d88965bf75 100644
--- a/srcpkgs/lvm2/files/lvm2.initramfs-hook
+++ b/srcpkgs/lvm2/files/lvm2.initramfs-hook
@@ -26,10 +26,11 @@ if [ -e /etc/lvm/lvm.conf ]; then
 fi
 
 mkdir -p ${DESTDIR}/lib/udev/rules.d
-for f in 10-dm.rules 11-dm-initramfs.rules 11-dm-lvm.rules \
-	13-dm-disk.rules 95-dm-notify.rules; do
-	cp /lib/udev/rules.d/${f} ${DESTDIR}/lib/udev/rules.d
+for f in 10-dm 11-dm-lvm 13-dm-disk 95-dm-notify; do
+	cp /lib/udev/rules.d/${f}.rules ${DESTDIR}/lib/udev/rules.d
 done
+cp /usr/share/initramfs-tools/udev-rules/11-dm-initramfs.rules \
+	${DESTDIR}/lib/udev/rules.d
 
 copy_exec /usr/sbin/dmsetup /sbin
 copy_exec /usr/sbin/lvm /sbin
diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index 8e99c48690a..ca83b5cf7c7 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -1,7 +1,7 @@
 # Template file for 'lvm2'
 pkgname=lvm2
 version=2.02.95
-revision=2
+revision=3
 wrksrc=LVM2.${version}
 distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz"
 build_style=gnu-configure
@@ -43,5 +43,4 @@ post_install() {
 		${initramfsdir}/hooks lvm2
 	vinstall ${FILESDIR}/lvm2.initramfs-local-top 755 \
 		${initramfsdir}/scripts/local-top lvm2
-	vinstall ${FILESDIR}/11-dm-initramfs.rules 644 lib/udev/rules.d
 }