diff --git a/ChangeLog b/ChangeLog
index 69b184dc995b8d71fca7133fd4fc1ae3b490b5ed..12d5d314fdea1a6b138f66baf03f101c1a6f3c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 19 09:26:53 EDT 2009 Cole Robinson <crobinso@redhat.com>
+
+	* src/node_device_hal.c: Fix node device media insert/eject
+	detection.
+
 Tue May 19 09:24:54 EDT 2009 Cole Robinson <crobinso@redhat.com>
 
 	* src/node_device_hal.c: Fix a possible deadlock in HAL nodedev
diff --git a/src/node_device_hal.c b/src/node_device_hal.c
index e9ea163b98391543faaf2818a70d178b8256a4a1..b0955e812fb7948fb7823aae4c57f284b7e74819 100644
--- a/src/node_device_hal.c
+++ b/src/node_device_hal.c
@@ -725,7 +725,8 @@ static int halDeviceMonitorStartup(void)
         !libhal_ctx_set_device_removed(hal_ctx, device_removed) ||
         !libhal_ctx_set_device_new_capability(hal_ctx, device_cap_added) ||
         !libhal_ctx_set_device_lost_capability(hal_ctx, device_cap_lost) ||
-        !libhal_ctx_set_device_property_modified(hal_ctx, device_prop_modified)) {
+        !libhal_ctx_set_device_property_modified(hal_ctx, device_prop_modified) ||
+        !libhal_device_property_watch_all(hal_ctx, &err))    {
         fprintf(stderr, "%s: setting up HAL callbacks failed\n", __FUNCTION__);
         goto failure;
     }