diff --git a/collects/meta/build/build b/collects/meta/build/build
index 363fdf7666..0dab40b8a1 100755
--- a/collects/meta/build/build
+++ b/collects/meta/build/build
@@ -189,20 +189,21 @@ last_part_capital() {
 # simple name associations
 name_of_platform() {
   case "$1" in
-    ( "i386-linux"        ) echo "Linux/GCC3" ;;
-    ( "i386-linux-gcc2"   ) echo "Linux/GCC2" ;;
-    ( "i386-linux-fc2"    ) echo "Linux/Fedora Core 2" ;;
-    ( "i386-linux-fc5"    ) echo "Linux/Fedora Core 5" ;;
-    ( "i386-linux-fc6"    ) echo "Linux/Fedora Core 6" ;;
-    ( "i386-linux-f7"     ) echo "Linux/Fedora 7/i386" ;;
-    ( "x86_64-linux-f7"   ) echo "Linux/Fedora 7/x86_64" ;;
-    ( "i386-linux-f9"     ) echo "Linux/Fedora 9/i386" ;;
-    ( "i386-linux-f12"    ) echo "Linux/Fedora 12/i386" ;;
-    ( "i386-linux-debian"          ) echo "Linux/Debian-stable" ;;
-    ( "i386-linux-debian-testing"  ) echo "Linux/Debian-testing" ;;
-    ( "i386-linux-debian-unstable" ) echo "Linux/Debian-unstable" ;;
-    ( "i386-linux-ubuntu"          ) echo "Linux/Ubuntu" ;;
-    ( "i386-linux-ubuntu-"* ) echo "Linux/Ubuntu `last_part_capital \"$1\"`" ;;
+    ( "i386-linux"        ) echo "Linux/i386/GCC3" ;;
+    ( "i386-linux-gcc2"   ) echo "Linux/i386/GCC2" ;;
+    ( "i386-linux-fc2"    ) echo "Linux/i386/Fedora Core 2" ;;
+    ( "i386-linux-fc5"    ) echo "Linux/i386/Fedora Core 5" ;;
+    ( "i386-linux-fc6"    ) echo "Linux/i386/Fedora Core 6" ;;
+    ( "i386-linux-f7"     ) echo "Linux/i386/Fedora 7" ;;
+    ( "x86_64-linux-f7"   ) echo "Linux/x86_64/Fedora 7" ;;
+    ( "i386-linux-f9"     ) echo "Linux/i386/Fedora 9" ;;
+    ( "i386-linux-f12"    ) echo "Linux/i386/Fedora 12" ;;
+    ( "i386-linux-debian"          ) echo "Linux/i386/Debian-stable" ;;
+    ( "i386-linux-debian-testing"  ) echo "Linux/i386/Debian-testing" ;;
+    ( "i386-linux-debian-unstable" ) echo "Linux/i386/Debian-unstable" ;;
+    ( "i386-linux-ubuntu"          ) echo "Linux/i386/Ubuntu" ;;
+    ( "i386-linux-ubuntu-"* ) echo "Linux/i386/Ubuntu" \
+                                   "`last_part_capital \"$1\"`" ;;
     ( "i386-freebsd"      ) echo "FreeBSD" ;;
     ( "sparc-solaris"     ) echo "Solaris" ;;
     ( "i386-osx-mac"      ) echo "Mac OS X (Intel)" ;;
@@ -220,24 +221,22 @@ name_of_platform() {
 extra_description_of_platform() {
   local e=""
   case "$1" in
+    ( *"-osx-mac" ) e="An OS X Build." ;;
+    ( *"-darwin"  ) e="This is an X11 on Darwin build using";
+                    e="$e<tt>--enable-xonx</tt>, not a standard OS X build." ;;
     ( "i386-linux" ) e="Binaries for GCC3 (eg, RedHat 9 and Fedora Core)." ;;
     ( "i386-linux-gcc2" ) e="Binaries for old GCC2 setups (eg, RedHat 7.x)." ;;
-    ( "i386-linux-fc2"  ) e="A Linux build on Fedora Core 2." ;;
-    ( "i386-linux-fc5"  ) e="A Linux build on Fedora Core 5." ;;
-    ( "i386-linux-fc6"  ) e="A Linux build on Fedora Core 6." ;;
-    ( "i386-linux-f7"   ) e="A Linux build on Fedora 7 (i386)." ;;
-    ( "x86_64-linux-f7" ) e="A Linux build on Fedora 7 (x86_64)." ;;
-    ( "i386-linux-f9"   ) e="A Linux build on Fedora 9 (i386)." ;;
-    ( "i386-linux-f12"  ) e="A Linux build on Fedora 12 (i386)." ;;
-    ( "i386-linux-debian"          ) e="A Linux build on Debian Stable." ;;
-    ( "i386-linux-debian-testing"  ) e="A Linux build on Debian Testing." ;;
-    ( "i386-linux-debian-unstable" ) e="A Linux build on Debian Unstable." ;;
-    ( "i386-linux-ubuntu" )   e="A Linux build on Ubuntu." ;;
-    ( "i386-linux-ubuntu-"* )
-        e="A Linux build on Ubuntu (`last_part_capital \"$1\"`)." ;;
-    ( *"-osx-mac" ) e="An OS X Build." ;;
-    ( *"-darwin" )  e="This is an X11 on Darwin build using";
-                    e="$e<tt>--enable-xonx</tt>, not a standard OS X build." ;;
+    ( "i386-linux-"*   ) e="A Linux i386 build" ;;
+    ( "x86_64-linux-"* ) e="A Linux x86_64 build" ;;
+  esac
+  case "$1" in
+    ( *"-linux-fc"[0-9]*        ) e="$e on Fedora Core ${1##*-fc}." ;;
+    ( *"-linux-f"[0-9]*         ) e="$e on Fedora ${1##*-f}." ;;
+    ( *"-linux-debian"          ) e="$e on Debian Stable." ;;
+    ( *"-linux-debian-testing"  ) e="$e on Debian Testing." ;;
+    ( *"-linux-debian-unstable" ) e="$e on Debian Unstable." ;;
+    ( *"-linux-ubuntu"   ) e="$e on Ubuntu." ;;
+    ( *"-linux-ubuntu-"* ) e="$e on Ubuntu (`last_part_capital \"$1\"`)." ;;
   esac
   if [[ "$e" != "" ]]; then echo "<br><small>${e}</small>"; fi
 }
diff --git a/collects/meta/dist-specs.rkt b/collects/meta/dist-specs.rkt
index abfeb7c217..3142d632c1 100644
--- a/collects/meta/dist-specs.rkt
+++ b/collects/meta/dist-specs.rkt
@@ -686,23 +686,23 @@ version := (lambda () (version))
 platform
 := (cond i386-linux        => "Linux (i386)"
          i386-linux-gcc2   => "Linux (i386/gcc2)"
-         i386-linux-fc2    => "Fedora Core 2 (i386)"
-         i386-linux-fc5    => "Fedora Core 5 (i386)"
-         i386-linux-fc6    => "Fedora Core 6 (i386)"
-         i386-linux-f7     => "Fedora 7 (i386)"
-         x86_64-linux-f7   => "Fedora 7 (x86_64)"
-         i386-linux-f9     => "Fedora 9 (i386)"
-         i386-linux-f12    => "Fedora 12 (i386)"
-         i386-linux-debian => "Debian Stable (i386)"
-         i386-linux-debian-testing  => "Debian Testing (i386)"
-         i386-linux-debian-unstable => "Debian Unstable (i386)"
-         i386-linux-ubuntu          => "Ubuntu (i386)"
-         i386-linux-ubuntu-dapper   => "Ubuntu Dapper (i386)"
-         i386-linux-ubuntu-edgy     => "Ubuntu Edgy (i386)"
-         i386-linux-ubuntu-feisty   => "Ubuntu Feisty (i386)"
-         i386-linux-ubuntu-hardy    => "Ubuntu Hardy (i386)"
-         i386-linux-ubuntu-intrepid => "Ubuntu Intrepid (i386)"
-         i386-linux-ubuntu-jaunty   => "Ubuntu Jaunty (i386)"
+         i386-linux-fc2    => "Linux i386, built on Fedora Core 2"
+         i386-linux-fc5    => "Linux i386, built on Fedora Core 5"
+         i386-linux-fc6    => "Linux i386, built on Fedora Core 6"
+         i386-linux-f7     => "Linux i386, built on Fedora 7"
+         x86_64-linux-f7   => "Linux x86_64, built on Fedora 7"
+         i386-linux-f9     => "Linux i386, built on Fedora 9"
+         i386-linux-f12    => "Linux i386, built on Fedora 12"
+         i386-linux-debian => "Linux i386, built on Debian Stable"
+         i386-linux-debian-testing  => "Linux i386, built on Debian Testing"
+         i386-linux-debian-unstable => "Linux i386, built on Debian Unstable"
+         i386-linux-ubuntu          => "Linux i386, built on Ubuntu"
+         i386-linux-ubuntu-dapper   => "Linux i386, built on Ubuntu Dapper"
+         i386-linux-ubuntu-edgy     => "Linux i386, built on Ubuntu Edgy"
+         i386-linux-ubuntu-feisty   => "Linux i386, built on Ubuntu Feisty"
+         i386-linux-ubuntu-hardy    => "Linux i386, built on Ubuntu Hardy"
+         i386-linux-ubuntu-intrepid => "Linux i386, built on Ubuntu Intrepid"
+         i386-linux-ubuntu-jaunty   => "Linux i386, built on Ubuntu Jaunty"
          i386-freebsd      => "FreeBSD (i386)"
          sparc-solaris     => "Solaris"
          ppc-osx-mac       => "Mac OS X (PPC)"
diff --git a/collects/meta/web/download/data.rkt b/collects/meta/web/download/data.rkt
index 89381ac7fa..0c2b48b5c0 100644
--- a/collects/meta/web/download/data.rkt
+++ b/collects/meta/web/download/data.rkt
@@ -58,16 +58,17 @@
      ,(lambda (_ cpu)
         (format "Macintosh Darwin (~a)"
                 (if (equal? cpu "ppc") "PPC" "Intel")))]
-    ["i386-linux(-gcc2)?"            "Linux (i386)"]
-    ["i386-linux-fc([0-9]+)"         "Linux - Fedora Core \\1 (i386)"]
-    ["(i386|x86_64)-linux-f([0-9]+)" "Linux - Fedora \\2 (\\1)"]
-    ["i386-linux-debian"             "Linux - Debian Stable (i386)"]
-    ["i386-linux-debian-(testing|unstable)"  "Linux - Debian \\1 (i386)"]
-    ["i386-linux-ubuntu[0-9]*"       "Linux - Ubuntu (i386)"]
-    ["i386-linux-ubuntu-([a-z]*)"    "Linux - Ubuntu \\1 (i386)"]
-    ["i386-freebsd"                  "FreeBSD (i386)"]
-    ["sparc-solaris"                 "Sparc Solaris (SunOS)"]
-    ["i386-kernel"                   "x86 Standalone Kernel"]
+    ["i386-linux(-gcc2)?"                  "Linux i386"]
+    ["i386-linux-fc([0-9]+)"               "Linux i386 (Fedora Core \\1)"]
+    ["(i386|x86_64)-linux-f([0-9]+)"       "Linux \\1 (Fedora \\2)"]
+    ["(i386|x86_64)-linux-debian"          "Linux \\1 (Debian Stable)"]
+    ["(i386|x86_64)-linux-debian-(testing|unstable)" "Linux \\1 (Debian \\2)"]
+    ["(i386|x86_64)-linux-ubuntu[0-9]+"    "Linux \\1 (Ubuntu \\2)"]
+    ["(i386|x86_64)-linux-ubuntu-([a-z]+)" "Linux \\1 (Ubuntu \\2)"]
+    ["(i386|x86_64)-linux-ubuntu.*"        "Linux \\1 (Ubuntu)"]
+    ["(i386|x86_64)-freebsd"               "FreeBSD \\1"]
+    ["sparc-solaris"                       "Sparc Solaris (SunOS)"]
+    ["i386-kernel"                         "x86 Standalone Kernel"]
     ))
 
 (define -file-type-names-