diff --git a/local/fork-upstream-map.toml b/local/fork-upstream-map.toml
index 00c1a43db1..921d160a59 100644
--- a/local/fork-upstream-map.toml
+++ b/local/fork-upstream-map.toml
@@ -12,6 +12,9 @@
 # `<X.Y.Z>` part match the upstream tag listed here, and the source
 # content MUST be a real rebase onto that upstream tag plus documented
 # Red Bear patches (in local/patches/<name>/).
+#
+# On branch 0.3.0, all Cat 2 forks use the +rb0.3.0 build-metadata suffix
+# in their Cargo.toml version fields (e.g. 0.6.0+rb0.3.0).
 
 # Format: <fork-name>  <upstream-git-url>  <upstream-release-tag>  [snapshot]
 #
@@ -30,8 +33,8 @@ syscall      https://gitlab.redox-os.org/redox-os/syscall.git      0.9.0      sn
 libredox     https://gitlab.redox-os.org/redox-os/libredox.git     0.1.18    snapshot
 redoxfs      https://gitlab.redox-os.org/redox-os/redoxfs.git      0.9.1
 redox-scheme https://gitlab.redox-os.org/redox-os/redox-scheme.git 0.11.2    snapshot
-relibc       https://gitlab.redox-os.org/redox-os/relibc.git       0.2.5     snapshot
-kernel       https://gitlab.redox-os.org/redox-os/kernel.git       0.5.12    snapshot
+relibc       https://gitlab.redox-os.org/redox-os/relibc.git       0.6.0     snapshot
+kernel       https://gitlab.redox-os.org/redox-os/kernel.git       0.6.0     snapshot
 bootloader   https://gitlab.redox-os.org/redox-os/bootloader.git   1.0.0     snapshot
 installer    https://gitlab.redox-os.org/redox-os/installer.git    0.2.42    snapshot
 userutils    https://gitlab.redox-os.org/redox-os/userutils.git    0.1.0     snapshot