diff --git a/sources/lib/dood/dood.dylan b/sources/lib/dood/dood.dylan
index 5a876a79de..88ace4c8fe 100644
--- a/sources/lib/dood/dood.dylan
+++ b/sources/lib/dood/dood.dylan
@@ -558,6 +558,8 @@ define method initialize
     (dood :: <dood>, #rest all-keys,
      #key name, locator, if-exists, stream, backups?, segments, #all-keys)
   next-method();
+  assert($word-size = $machine-word-size,
+         "DOOD word-size must match the machine word size");
   dood-init-keys(dood) := copy-sequence(all-keys);
   unless (segments)
     dood-segments(dood)
diff --git a/sources/registry/aarch64-linux/dood b/sources/registry/aarch64-linux/dood
index 466a24e088..65432a097d 100644
--- a/sources/registry/aarch64-linux/dood
+++ b/sources/registry/aarch64-linux/dood
@@ -1 +1 @@
-abstract://dylan/lib/dood/dood.lid
+abstract://dylan/lib/dood/dood-64.lid
diff --git a/sources/registry/riscv64-linux/dood b/sources/registry/riscv64-linux/dood
index 466a24e088..65432a097d 100644
--- a/sources/registry/riscv64-linux/dood
+++ b/sources/registry/riscv64-linux/dood
@@ -1 +1 @@
-abstract://dylan/lib/dood/dood.lid
+abstract://dylan/lib/dood/dood-64.lid