diff --git a/devices/pc8080/machine/invaders/README.md b/devices/pc8080/machine/invaders/README.md
index d32fa2544..d7792bc66 100644
--- a/devices/pc8080/machine/invaders/README.md
+++ b/devices/pc8080/machine/invaders/README.md
@@ -5,7 +5,6 @@ permalink: /devices/pc8080/machine/invaders/
machines:
- type: pc8080
id: invaders
- debugger: true
---
Space Invaders (1978)
diff --git a/devices/pc8080/machine/invaders/debugger/README.md b/devices/pc8080/machine/invaders/debugger/README.md
new file mode 100644
index 000000000..7ea9b9947
--- /dev/null
+++ b/devices/pc8080/machine/invaders/debugger/README.md
@@ -0,0 +1,27 @@
+---
+layout: page
+title: Space Invaders (1978) with Debugger
+permalink: /devices/pc8080/machine/invaders/debugger/
+machines:
+ - type: pc8080
+ id: invaders
+ debugger: true
+---
+
+Space Invaders (1978) with Debugger
+-----------------------------------
+
+The [PC8080](/modules/pc8080/) machine below is configured to run [Space Invaders](/devices/pc8080/machine/invaders/)
+with a Control Panel and Debugger. It is currently playable only in desktop browsers and uses the following hard-coded
+key mappings:
+
+- 1: One Player
+- 2: Two Player
+- 3: Insert Coin
+- A: Move Left
+- D: Move Right
+- L: Fire Missile
+
+Click the "Run" button when you're ready to start the simulation.
+
+{% include machine.html id="invaders" %}
diff --git a/devices/pc8080/machine/invaders/debugger/machine.xml b/devices/pc8080/machine/invaders/debugger/machine.xml
new file mode 100644
index 000000000..170279973
--- /dev/null
+++ b/devices/pc8080/machine/invaders/debugger/machine.xml
@@ -0,0 +1,24 @@
+
+
+
+ Space Invaders
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/devices/pc8080/machine/invaders/machine.xml b/devices/pc8080/machine/invaders/machine.xml
index 170279973..99a0839bb 100644
--- a/devices/pc8080/machine/invaders/machine.xml
+++ b/devices/pc8080/machine/invaders/machine.xml
@@ -9,7 +9,7 @@
-