diff --git a/README.md b/README.md
index 38d1c935c..bde278903 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ Some pre-configured machines are shown below, ready to run BASIC, DOS, Windows 1
+
diff --git a/blog/2014/12/04/README.md b/blog/2014/12/04/README.md
index a55364b55..1b1fa49f0 100644
--- a/blog/2014/12/04/README.md
+++ b/blog/2014/12/04/README.md
@@ -1,14 +1,13 @@
OS/2 1.0
---
-Exciting news for OS/2 fans: PCjs (v1.16.1) is now able to run OS/2 1.0 on IBM PC AT (80286) machine configurations.
+Exciting news for OS/2 fans: PCjs (v1.16.1) is now able to run OS/2 1.0 on
+[IBM PC AT Machine Configurations](/devices/pc/machine/#model-5170-machine-configurations). This is the culmination
+of recent work in PCjs to fully emulate the Intel 80286 processor and 16-bit protected-mode, including undocumented
+features like [LOADALL](/pubs/pc/reference/intel/80286/loadall/) and triple-fault resets.
-To test it out, go to [IBM PC Machine Configurations](/devices/pc/machine/), scroll down to the Model 5170 machines,
-and choose one. For drive A:, select "OS/2 1.0 Debugger Boot Disk", click "Download", and then click the "Run"
-button.
-
-In a few seconds, you'll see a very rudimentary OS/2 shell (a slimmed-down version of the OS/2 Program Selector)
-that allows you to start the protected-mode command interpreter ("Start a Program") or the real-mode command
-interpreter ("command.com").
+For a quick demo, try the "[OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/debugger/)". In a few seconds,
+you'll see a very rudimentary OS/2 shell (a slimmed-down version of the OS/2 Program Selector) that allows you to
+start the protected-mode command interpreter ("Start a Program") or the real-mode command interpreter ("command.com").
diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md
index 24f865bd1..830bfa503 100644
--- a/devices/pc/machine/README.md
+++ b/devices/pc/machine/README.md
@@ -7,14 +7,14 @@ Here you'll find sample Machine Configurations for all the IBM PC models that PC
* [Model 5160](/devices/pc/machine/5160/)
* [Model 5170](/devices/pc/machine/5170/)
-Model 5150 Machine Configurations include:
+### Model 5150 Machine Configurations
* [IBM PC, MDA, 64K](/devices/pc/machine/5150/mda/64kb/)
* [IBM PC, MDA, 64K, Debugger](/devices/pc/machine/5150/mda/64kb/debugger/)
* [IBM PC, CGA, 64K, DONKEY.BAS](/devices/pc/machine/5150/cga/64kb/donkey/)
* [IBM PC, CGA, 64K, DONKEY.BAS, Debugger](/devices/pc/machine/5150/cga/64kb/donkey/debugger/)
-Model 5160 Machine Configurations include:
+### Model 5160 Machine Configurations
* [IBM PC XT, CGA, 256K, 10Mb Drive](/devices/pc/machine/5160/cga/256kb/demo/)
* [IBM PC XT, CGA, 256K, 10Mb Drive, Debugger](/devices/pc/machine/5160/cga/256kb/demo/debugger/)
@@ -29,13 +29,13 @@ Model 5160 Machine Configurations include:
* [IBM PC XT, EGA, 640K, Windows 1.01](/devices/pc/machine/5160/ega/640kb/win101/)
* [IBM PC XT, EGA "Server Array" Demo](/devices/pc/machine/5160/ega/640kb/array/)
-Model 5170 Machine Configurations include:
+### Model 5170 Machine Configurations
* [IBM PC AT (6Mhz), EGA, 640K, Debugger](/devices/pc/machine/5170/ega/640kb/rev1/)
* [IBM PC AT (6Mhz), EGA, 1152Kb, 20Mb Drive, Debugger](/devices/pc/machine/5170/ega/1152kb/rev1/)
* [IBM PC AT (8Mhz), EGA, 1152Kb, 20Mb Drive, Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/)
-These Machine Configurations also include a "Soft Keyboard":
+### Machine Configurations with "Soft Keyboard"
* [IBM PC, MDA, 64K](/devices/pc/machine/5150/mda/64kb/softkbd/)
* [IBM PC, CGA, 64K](/devices/pc/machine/5150/cga/64kb/softkbd/)
@@ -45,4 +45,4 @@ These Machine Configurations also include a "Soft Keyboard":
* [IBM PC XT, CGA, 256K, Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/softkbd/)
* [IBM PC XT, CGA, 512K, Windows 1.01](/devices/pc/machine/5160/cga/512kb/win101/softkbd/)
-There are also some pre-built Machine Configurations for selected [IBM PC Disk Sets](/disks/pc/).
\ No newline at end of file
+There are also some pre-built Machine Configurations for selected [IBM PC Disk Sets](/disks/pc/).
diff --git a/disks/pc/os2/ibm/1.0/machine.xml b/disks/pc/os2/ibm/1.0/machine.xml
new file mode 100644
index 000000000..5b84ec1fb
--- /dev/null
+++ b/disks/pc/os2/ibm/1.0/machine.xml
@@ -0,0 +1,21 @@
+
+
+
+ IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/disks/pc/os2/ibm/1.0/manifest.xml b/disks/pc/os2/ibm/1.0/manifest.xml
index e55b100bf..9addbd200 100644
--- a/disks/pc/os2/ibm/1.0/manifest.xml
+++ b/disks/pc/os2/ibm/1.0/manifest.xml
@@ -2,6 +2,7 @@
IBM OS/2 1.0
+
OS/2 1.0 (1.44Mb Install)
diff --git a/disks/pc/os2/ibm/1.0/screenshot.png b/disks/pc/os2/ibm/1.0/screenshot.png
new file mode 100644
index 000000000..fc9428bf6
Binary files /dev/null and b/disks/pc/os2/ibm/1.0/screenshot.png differ
diff --git a/disks/pc/os2/ibm/1.0/thumbnail.jpg b/disks/pc/os2/ibm/1.0/thumbnail.jpg
new file mode 100644
index 000000000..26c83b162
Binary files /dev/null and b/disks/pc/os2/ibm/1.0/thumbnail.jpg differ
diff --git a/disks/pc/os2/misc/1.0/debugger/machine.xml b/disks/pc/os2/misc/1.0/debugger/machine.xml
new file mode 100644
index 000000000..1eb1bfbfb
--- /dev/null
+++ b/disks/pc/os2/misc/1.0/debugger/machine.xml
@@ -0,0 +1,21 @@
+
+
+
+ IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+