diff --git a/ChangeLog b/ChangeLog
index 4b08206922..9d9c162e87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 2 13:45:00 CET 2008 Chris Lalancette <clalance@redhat.com>
+	* configure.in, src/storage_backend.c: Older distributions (i.e.
+	RHEL-5) don't have udevadm at all, but they do have udevsettle.  So
+	change our tests to prefer udevadm if it exists, but to fall back to
+	udevsettle if it does not.
+
 Tue Dec 2 11:34:22 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* qemud/qemud.c: Registering network, storage & nodedev drivers
diff --git a/configure.in b/configure.in
index 5359433a1f..0036145317 100644
--- a/configure.in
+++ b/configure.in
@@ -117,6 +117,8 @@ AC_PATH_PROG([BRCTL], [brctl], [brctl],
 	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([UDEVADM], [udevadm], [],
 	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
+AC_PATH_PROG([UDEVSETTLE], [udevsettle], [],
+	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 
 AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"],
         [Location or name of the dnsmasq program])
@@ -126,6 +128,10 @@ if test -n "$UDEVADM"; then
   AC_DEFINE_UNQUOTED([UDEVADM],["$UDEVADM"],
         [Location or name of the udevadm program])
 fi
+if test -n "$UDEVSETTLE"; then
+  AC_DEFINE_UNQUOTED([UDEVSETTLE],["$UDEVSETTLE"],
+        [Location or name of the udevsettle program])
+fi
 
 dnl Specific dir for HTML output ?
 AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path],
diff --git a/src/storage_backend.c b/src/storage_backend.c
index 6b4fa818cb..bb247271c1 100644
--- a/src/storage_backend.c
+++ b/src/storage_backend.c
@@ -270,13 +270,17 @@ virStorageBackendUpdateVolInfoFD(virConnectPtr conn,
     return 0;
 }
 
-#ifdef UDEVADM
+#if defined(UDEVADM) || defined(UDEVSETTLE)
 void virStorageBackendWaitForDevices(virConnectPtr conn)
 {
+#ifdef UDEVADM
     const char *const settleprog[] = { UDEVADM, "settle", NULL };
+#else
+    const char *const settleprog[] = { UDEVSETTLE, NULL };
+#endif
     int exitstatus;
 
-    if (access(UDEVADM, X_OK) != 0)
+    if (access(settleprog[0], X_OK) != 0)
         return;
 
     /*