diff --git a/demos/bombs/.cvsignore b/demos/bombs/.cvsignore
index f7a96bf5b1..b2ecb02d1f 100644
--- a/demos/bombs/.cvsignore
+++ b/demos/bombs/.cvsignore
@@ -1,2 +1,5 @@
 makemac?Data
-PPC?Debug*
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*
diff --git a/demos/bombs/makemac.mcp b/demos/bombs/makemac.mcp
new file mode 100644
index 0000000000..4c985ee5ec
Binary files /dev/null and b/demos/bombs/makemac.mcp differ
diff --git a/demos/forty/.cvsignore b/demos/forty/.cvsignore
index d42c2bd4b2..b2ecb02d1f 100644
--- a/demos/forty/.cvsignore
+++ b/demos/forty/.cvsignore
@@ -1,3 +1,5 @@
 makemac?Data
-PPC?Debug*
-PPC?Release*
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*
diff --git a/demos/forty/makemac.mcp b/demos/forty/makemac.mcp
index 3e3096ff22..b390538194 100644
Binary files a/demos/forty/makemac.mcp and b/demos/forty/makemac.mcp differ
diff --git a/demos/fractal/.cvsignore b/demos/fractal/.cvsignore
index f7a96bf5b1..b2ecb02d1f 100644
--- a/demos/fractal/.cvsignore
+++ b/demos/fractal/.cvsignore
@@ -1,2 +1,5 @@
 makemac?Data
-PPC?Debug*
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*
diff --git a/demos/fractal/makemac.mcp b/demos/fractal/makemac.mcp
index 708732d5aa..5e73ce78a4 100644
Binary files a/demos/fractal/makemac.mcp and b/demos/fractal/makemac.mcp differ
diff --git a/demos/life/.cvsignore b/demos/life/.cvsignore
index d42c2bd4b2..b2ecb02d1f 100644
--- a/demos/life/.cvsignore
+++ b/demos/life/.cvsignore
@@ -1,3 +1,5 @@
 makemac?Data
-PPC?Debug*
-PPC?Release*
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*
diff --git a/demos/life/makemac.mcp b/demos/life/makemac.mcp
index a58891be47..8f79299112 100644
Binary files a/demos/life/makemac.mcp and b/demos/life/makemac.mcp differ
diff --git a/demos/poem/.cvsignore b/demos/poem/.cvsignore
index f7a96bf5b1..b2ecb02d1f 100644
--- a/demos/poem/.cvsignore
+++ b/demos/poem/.cvsignore
@@ -1,2 +1,5 @@
 makemac?Data
-PPC?Debug*
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*
diff --git a/demos/poem/makemac.mcp b/demos/poem/makemac.mcp
new file mode 100644
index 0000000000..0cc2179a77
Binary files /dev/null and b/demos/poem/makemac.mcp differ