diff --git a/west.yml b/west.yml
index e90e99d13..edc522eab 100644
--- a/west.yml
+++ b/west.yml
@@ -38,11 +38,20 @@ manifest:
       path: sof/rimage
       revision: ac487e09ca5bb34a2eebd2f3d1cfeb9e792c501a
 
-    - name: tomlc99
+    # To be removed in the next commits
+    - name: tomlc99-old-location
       repo-path: tomlc99
       path: sof/rimage/tomlc99
       revision: e3a03f5ec7d8d33be705c5ce8a632d998ce9b4d1
 
+    # West convenience for Zephyr people who forgot --recursive when
+    # cloning sof.git.  This adds the burden of keeping both tomlc99
+    # SHA1s synchronized but in practice it barely ever moves.
+    - name: tomlc99
+      repo-path: tomlc99
+      path: sof/tools/rimage/tomlc99
+      revision: e3a03f5ec7d8d33be705c5ce8a632d998ce9b4d1
+
     - name: zephyr
       repo-path: zephyr
       revision: 8c4eec7ac6e37be89af89e021c6f5c96e1ac1e0a