diff --git a/.gitignore b/.gitignore
index 48c1d1e..dfb8c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /LVM2.2.02.90.tgz
 /LVM2.2.02.91.tgz
 /LVM2.2.02.92.tgz
+/LVM2.2.02.93.tgz
diff --git a/LVM2.2.02.92.tgz.asc b/LVM2.2.02.92.tgz.asc
deleted file mode 100644
index de008cd..0000000
--- a/LVM2.2.02.92.tgz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-iD8DBQBPQq8yIoGRwVZ+LBcRAnpTAJ9s3S/AL1S0YeDR2PYu63l3VtKhXACfR0/W
-qLwf5jzbwGxEKPvYOzmGHUQ=
-=Vc+8
------END PGP SIGNATURE-----
diff --git a/LVM2.2.02.93.tgz.asc b/LVM2.2.02.93.tgz.asc
new file mode 100644
index 0000000..1fecce8
--- /dev/null
+++ b/LVM2.2.02.93.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (GNU/Linux)
+
+iD8DBQBPRoXaIoGRwVZ+LBcRAnNFAJwJuflQR3IRiqjo+hvAJQ320gczjgCgtflF
+WTVEVDD4J+esY9db/OKZsII=
+=WhRc
+-----END PGP SIGNATURE-----
diff --git a/lvm2-tmpfiles.conf b/lvm2-tmpfiles.conf
deleted file mode 100644
index 6e76fcb..0000000
--- a/lvm2-tmpfiles.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-D /var/lock/lvm 0700 root root -
-D /var/run/lvm 0700 root root -
diff --git a/lvm2.spec b/lvm2.spec
index 13eff9b..6306ddf 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.71
+%define device_mapper_version 1.02.72
 
 %define enable_thin 0
 %define enable_cluster 1
@@ -65,15 +65,12 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.92
+Version: 2.02.93
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-%if %{enable_systemd}
-Source1: %{name}-tmpfiles.conf
-%endif
 Patch0: lvm2-set-default-preferred_names.patch
 
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
@@ -145,8 +142,7 @@ make install_system_dirs DESTDIR=$RPM_BUILD_ROOT
 make install_initscripts DESTDIR=$RPM_BUILD_ROOT
 %if %{enable_systemd}
 make install_systemd_units DESTDIR=$RPM_BUILD_ROOT
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+make install_tmpfiles_configuration DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 %clean
@@ -631,6 +627,15 @@ the device-mapper event library.
 /usr%{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Thu Feb 23 2012 Alasdair Kergon <agk@redhat.com> - 2.02.93-1
+- Moved systemd tmpfiles installation upstream for lvm2 lock and run dirs.
+- Require number of stripes to be greater than parity devices in higher RAID.
+- Fix allocation code to allow replacement of single RAID 4/5/6 device.
+- Check all tags and LV names are in a valid form before writing any metadata.
+- Allow 'lvconvert --repair' to operate on RAID 4/5/6.
+- Fix build_parallel_areas_from_lv to account correctly for raid parity devices.
+- Print message when faulty raid devices have been replaced.
+
 * Mon Feb 20 2012 Alasdair Kergon <agk@redhat.com> - 2.02.92-1
 - Read dmeventd monitoring config settings for every lvm command.
 - For thin devices, initialize monitoring only for thin pools not thin volumes.
diff --git a/sources b/sources
index 9c28c75..6a0645d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7602eb1cd493b001d4ef46ff50ddd1c6  LVM2.2.02.92.tgz
+4d995eb712e58e95d3a4945a8379fc99  LVM2.2.02.93.tgz
diff --git a/upstream b/upstream
index 0b10ca1..bc604ab 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.92.tgz
+LVM2.2.02.93.tgz