diff --git a/_includes/machine.html b/_includes/machine.html
index 94c81654a..f60db81ef 100644
--- a/_includes/machine.html
+++ b/_includes/machine.html
@@ -1,9 +1,15 @@
- {% assign machine_name = "PCjs: The Virtual IBM PC" %}
+ {% assign machine_name = "PCjs Machine" %}
{% for machine in page.machines %}
- {% if include.id == machine.id and machine.name%}
- {% assign machine_name = machine.name %}
- {% break %}
+ {% if include.id == machine.id %}
+ {% if machine.name %}
+ {% assign machine_name = machine.name %}
+ {% break %}
+ {% endif %}
+ {% if machine.type %}
+ {% capture machine_name %}{{ machine.type | upcase | replace:"X86","x86" }} Machine{% endcapture %}
+ {% break %}
+ {% endif %}
{% endif %}
{% endfor %}
[{{ machine_name }}]
diff --git a/archive/index.html b/archive/index.html
index 05d3398ed..2c96cabb6 100644
--- a/archive/index.html
+++ b/archive/index.html
@@ -4,8 +4,8 @@
-
PCjs: The Virtual IBM PC
-
+ PCjs Machines
+
@@ -24,7 +24,7 @@