diff --git a/devices/pcx86/machine/5170/ega/2048kb/README.md b/devices/pcx86/machine/5170/ega/2048kb/README.md
index 64b829687..c0e9ba902 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/README.md
+++ b/devices/pcx86/machine/5170/ega/2048kb/README.md
@@ -11,3 +11,4 @@ IBM PC AT with 2Mb RAM and Enhanced Color Graphics (EGA) Display
 ---
 
 * [IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with EGA Display](/devices/pcx86/machine/5170/ega/2048kb/rev3/) ([Debugger](/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/),[Backtrack](/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/))
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with EGA Display and VT100](/devices/pcx86/machine/5170/ega/2048kb/rev3/vt100/) ([Debuggers](/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/))
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.md b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/README.md
similarity index 58%
rename from devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.md
rename to devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/README.md
index efcfc82c2..f4608f5c2 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.md
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/README.md
@@ -1,19 +1,27 @@
 ---
 layout: page
-title: IBM PC AT (Model 5170, 2Mb, 20Mb Hard Disk) with EGA Display and VT100 Debugger
+title: IBM PC AT (Model 5170, 2Mb, 20Mb Hard Disk) with EGA Display, VT100, and Debuggers
 permalink: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/
 machines:
   - id: ibm5170
     type: pcx86
     debugger: true
+    autoStart: true
     connection: com2->vt100.serialPort
+    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
   - id: vt100
     type: pc8080
     debugger: true
+    autoStart: true
     connection: serialPort->ibm5170.com2
     config: /devices/pc8080/machine/vt100/debugger/machine.xml
 ---
 
+IBM PC AT with VT100 Terminal and Dual Debuggers
+------------------------------------------------
+
+Demonstration of a [IBM PC AT with VT100 Terminal](../../vt100/) connected via COM2, with Debuggers attached.
+
 {% include machine.html id="ibm5170" %}
 
 {% include machine.html id="vt100" %}
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml
deleted file mode 100644
index 9db47f2bc..000000000
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.24.0/machine.xsl"?>
-<machine id="ibm5170" class="pcx86" border="1" pos="center" background="#FAEBD7">
-	<name>IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk</name>
-	<computer id="at-ega-2048k" name="IBM PC AT" buswidth="24"/>
-	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true"/>
-	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
-	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
-	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
-	<debugger id="debugger" messages="fault" commands=""/>
-	<panel ref="/devices/pcx86/panel/wide.xml"/>
-	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
-	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
-	<serial id="com1" adapter="1"/>
-	<serial id="com2" adapter="2" binding="print" tabsize="8" charbol="9"/>
-	<mouse serial="com1"/>
-</machine>
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
index 1d8dbdaaa..925db3242 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
@@ -13,5 +13,6 @@
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
+	<serial id="com2" adapter="2"/>
 	<mouse serial="com1"/>
 </machine>
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/vt100/README.md b/devices/pcx86/machine/5170/ega/2048kb/rev3/vt100/README.md
new file mode 100644
index 000000000..989061855
--- /dev/null
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/vt100/README.md
@@ -0,0 +1,25 @@
+---
+layout: page
+title: IBM PC AT (Model 5170, 2Mb, 20Mb Hard Disk) with EGA Display and VT100
+permalink: /devices/pcx86/machine/5170/ega/2048kb/rev3/vt100/
+machines:
+  - id: ibm5170
+    type: pcx86
+    connection: com2->vt100.serialPort
+    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
+  - id: vt100
+    type: pc8080
+    connection: serialPort->ibm5170.com2
+    config: /devices/pc8080/machine/vt100/machine.xml
+---
+
+IBM PC AT with VT100 Terminal
+---
+
+Demonstration of an IBM PC AT with VT100 Terminal connected via COM2.
+
+A [Dual Debugger Configuration](../debugger/vt100/) is also available.
+
+{% include machine.html id="ibm5170" %}
+
+{% include machine.html id="vt100" %}
diff --git a/devices/pcx86/machine/5170/ega/README.md b/devices/pcx86/machine/5170/ega/README.md
index e935018d2..23b3be40b 100644
--- a/devices/pcx86/machine/5170/ega/README.md
+++ b/devices/pcx86/machine/5170/ega/README.md
@@ -16,3 +16,4 @@ All our Enhanced Color Graphics (EGA) configurations of the IBM PC AT (Model 517
 * [IBM PC AT (6Mhz, 1Mb, 20Mb Hard Disk) with EGA Display](/devices/pcx86/machine/5170/ega/1152kb/rev1/) ([Debugger](/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/))
 * [IBM PC AT (8Mhz, 1Mb, 20Mb Hard Disk) with EGA Display](/devices/pcx86/machine/5170/ega/1152kb/rev3/) ([Debugger](/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/),[Backtrack](/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/))
 * [IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with EGA Display](/devices/pcx86/machine/5170/ega/2048kb/rev3/) ([Debugger](/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/),[Backtrack](/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/))
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with EGA Display and VT100](/devices/pcx86/machine/5170/ega/2048kb/rev3/vt100/) ([Debuggers](/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/))