diff --git a/managemon.c b/managemon.c
index b211d8f..d2925ae 100644
--- a/managemon.c
+++ b/managemon.c
@@ -228,12 +228,35 @@ static void manage_container(struct mdstat_ent *mdstat,
 	 * about spare assignment.... probably not.
 	 */
 	if (mdstat->devcnt != container->devcnt) {
+		struct mdinfo **cdp, *cd, *di, *mdi;
+		int found;
+
 		/* read /sys/block/NAME/md/dev-??/block/dev to find out
 		 * what is there, and compare with container->info.devs
 		 * To see what is removed and what is added.
 		 * These need to be remove from, or added to, the array
 		 */
-		// FIXME
+		mdi = sysfs_read(-1, mdstat->devnum, GET_DEVS);
+		if (!mdi)
+			return;
+
+		/* check for removals */
+		for (cdp = &container->devs; *cdp; ) {
+			found = 0;
+			for (di = mdi->devs; di; di = di->next)
+				if (di->disk.major == (*cdp)->disk.major &&
+				    di->disk.minor == (*cdp)->disk.minor) {
+					found = 1;
+					break;
+				}
+			if (!found) {
+				cd = *cdp;
+				*cdp = (*cdp)->next;
+				free(cd);
+			} else
+				cdp = &(*cdp)->next;
+		}
+		sysfs_free(mdi);
 		container->devcnt = mdstat->devcnt;
 	}
 }
diff --git a/mdmon.c b/mdmon.c
index 85f44bc..9485757 100644
--- a/mdmon.c
+++ b/mdmon.c
@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
 	container->devs = NULL;
 	for (di = mdi->devs; di; di = di->next) {
 		struct mdinfo *cd = malloc(sizeof(*cd));
-		cd = di;
+		*cd = *di;
 		cd->next = container->devs;
 		container->devs = cd;
 	}