diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor
index 68fbf55105..371902e16d 100644
--- a/basis/bootstrap/image/image.factor
+++ b/basis/bootstrap/image/image.factor
@@ -15,12 +15,7 @@ generalizations ;
 IN: bootstrap.image
 
 : arch ( os cpu -- arch )
-    [ dup "winnt" = "winnt" "unix" ? ] dip
-    {
-        { "ppc" [ drop "-ppc" append ] }
-        { "x86.32" [ nip "-x86.32" append ] }
-        { "x86.64" [ nip "-x86.64" append ] }
-    } case ;
+    [ "winnt" = "winnt" "unix" ? ] dip "-" glue ;
 
 : my-arch ( -- arch )
     os name>> cpu name>> arch ;
@@ -35,7 +30,6 @@ IN: bootstrap.image
     {
         "winnt-x86.32" "unix-x86.32"
         "winnt-x86.64" "unix-x86.64"
-        "linux-ppc" "macosx-ppc"
     } ;
 
 <PRIVATE
diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index 4df08aebf9..7143d03993 100644
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -22,9 +22,6 @@ architecture get {
     { "unix-x86.32" "x86/32/unix" }
     { "winnt-x86.64" "x86/64/winnt" }
     { "unix-x86.64" "x86/64/unix" }
-    { "linux-ppc" "ppc/linux" }
-    { "macosx-ppc" "ppc/macosx" }
-    { "arm" "arm" }
 } ?at [ "Bad architecture: " prepend throw ] unless
 "vocab:cpu/" "/bootstrap.factor" surround parse-file
 
diff --git a/basis/cpu/arm/assembler/assembler-tests.factor b/extra/cpu/arm/assembler/assembler-tests.factor
similarity index 100%
rename from basis/cpu/arm/assembler/assembler-tests.factor
rename to extra/cpu/arm/assembler/assembler-tests.factor
diff --git a/basis/cpu/arm/assembler/assembler.factor b/extra/cpu/arm/assembler/assembler.factor
similarity index 100%
rename from basis/cpu/arm/assembler/assembler.factor
rename to extra/cpu/arm/assembler/assembler.factor
diff --git a/basis/cpu/arm/assembler/authors.txt b/extra/cpu/arm/assembler/authors.txt
similarity index 100%
rename from basis/cpu/arm/assembler/authors.txt
rename to extra/cpu/arm/assembler/authors.txt
diff --git a/basis/cpu/ppc/assembler/assembler-tests.factor b/extra/cpu/ppc/assembler/assembler-tests.factor
similarity index 100%
rename from basis/cpu/ppc/assembler/assembler-tests.factor
rename to extra/cpu/ppc/assembler/assembler-tests.factor
diff --git a/basis/cpu/ppc/assembler/assembler.factor b/extra/cpu/ppc/assembler/assembler.factor
similarity index 100%
rename from basis/cpu/ppc/assembler/assembler.factor
rename to extra/cpu/ppc/assembler/assembler.factor
diff --git a/basis/cpu/ppc/assembler/authors.txt b/extra/cpu/ppc/assembler/authors.txt
similarity index 100%
rename from basis/cpu/ppc/assembler/authors.txt
rename to extra/cpu/ppc/assembler/authors.txt
diff --git a/basis/cpu/ppc/assembler/backend/backend.factor b/extra/cpu/ppc/assembler/backend/backend.factor
similarity index 100%
rename from basis/cpu/ppc/assembler/backend/backend.factor
rename to extra/cpu/ppc/assembler/backend/backend.factor
diff --git a/basis/cpu/ppc/assembler/summary.txt b/extra/cpu/ppc/assembler/summary.txt
similarity index 100%
rename from basis/cpu/ppc/assembler/summary.txt
rename to extra/cpu/ppc/assembler/summary.txt
diff --git a/extra/webapps/mason/grids/grids.factor b/extra/webapps/mason/grids/grids.factor
index d9d12ef745..9c861e1345 100644
--- a/extra/webapps/mason/grids/grids.factor
+++ b/extra/webapps/mason/grids/grids.factor
@@ -26,7 +26,6 @@ CONSTANT: cpus
 {
     { "x86.32" "x86" }
     { "x86.64" "x86-64" }
-    { "ppc" "PowerPC" }
 }
 
 : render-grid-header ( -- xml )
diff --git a/basis/cpu/ppc/authors.txt b/unmaintained/ppc/authors.txt
similarity index 100%
rename from basis/cpu/ppc/authors.txt
rename to unmaintained/ppc/authors.txt
diff --git a/basis/cpu/ppc/bootstrap.factor b/unmaintained/ppc/bootstrap.factor
similarity index 100%
rename from basis/cpu/ppc/bootstrap.factor
rename to unmaintained/ppc/bootstrap.factor
diff --git a/basis/cpu/ppc/linux/bootstrap.factor b/unmaintained/ppc/linux/bootstrap.factor
similarity index 100%
rename from basis/cpu/ppc/linux/bootstrap.factor
rename to unmaintained/ppc/linux/bootstrap.factor
diff --git a/basis/cpu/ppc/linux/linux.factor b/unmaintained/ppc/linux/linux.factor
similarity index 100%
rename from basis/cpu/ppc/linux/linux.factor
rename to unmaintained/ppc/linux/linux.factor
diff --git a/basis/cpu/ppc/linux/summary.txt b/unmaintained/ppc/linux/summary.txt
similarity index 100%
rename from basis/cpu/ppc/linux/summary.txt
rename to unmaintained/ppc/linux/summary.txt
diff --git a/basis/cpu/ppc/linux/tags.txt b/unmaintained/ppc/linux/tags.txt
similarity index 100%
rename from basis/cpu/ppc/linux/tags.txt
rename to unmaintained/ppc/linux/tags.txt
diff --git a/basis/cpu/ppc/macosx/bootstrap.factor b/unmaintained/ppc/macosx/bootstrap.factor
similarity index 100%
rename from basis/cpu/ppc/macosx/bootstrap.factor
rename to unmaintained/ppc/macosx/bootstrap.factor
diff --git a/basis/cpu/ppc/macosx/macosx.factor b/unmaintained/ppc/macosx/macosx.factor
similarity index 100%
rename from basis/cpu/ppc/macosx/macosx.factor
rename to unmaintained/ppc/macosx/macosx.factor
diff --git a/basis/cpu/ppc/macosx/summary.txt b/unmaintained/ppc/macosx/summary.txt
similarity index 100%
rename from basis/cpu/ppc/macosx/summary.txt
rename to unmaintained/ppc/macosx/summary.txt
diff --git a/basis/cpu/ppc/macosx/tags.txt b/unmaintained/ppc/macosx/tags.txt
similarity index 100%
rename from basis/cpu/ppc/macosx/tags.txt
rename to unmaintained/ppc/macosx/tags.txt
diff --git a/basis/cpu/ppc/ppc.factor b/unmaintained/ppc/ppc.factor
similarity index 100%
rename from basis/cpu/ppc/ppc.factor
rename to unmaintained/ppc/ppc.factor
diff --git a/basis/cpu/ppc/summary.txt b/unmaintained/ppc/summary.txt
similarity index 100%
rename from basis/cpu/ppc/summary.txt
rename to unmaintained/ppc/summary.txt
diff --git a/basis/cpu/ppc/tags.txt b/unmaintained/ppc/tags.txt
similarity index 100%
rename from basis/cpu/ppc/tags.txt
rename to unmaintained/ppc/tags.txt