diff --git a/extra/balloon-bomber/balloon-bomber-docs.factor b/extra/balloon-bomber/balloon-bomber-docs.factor
index ad7464aa64..694ac1882a 100644
--- a/extra/balloon-bomber/balloon-bomber-docs.factor
+++ b/extra/balloon-bomber/balloon-bomber-docs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: help.syntax help.markup cpu.8080 ;
+USING: help.syntax help.markup cpu.8080.emulator ;
 IN: balloon-bomber
 
 HELP: run 
diff --git a/extra/cpu/8080/authors.txt b/extra/cpu/8080/authors.txt
new file mode 100644
index 0000000000..44b06f94bc
--- /dev/null
+++ b/extra/cpu/8080/authors.txt
@@ -0,0 +1 @@
+Chris Double
diff --git a/extra/cpu/8080/emulator/authors.txt b/extra/cpu/8080/emulator/authors.txt
new file mode 100644
index 0000000000..44b06f94bc
--- /dev/null
+++ b/extra/cpu/8080/emulator/authors.txt
@@ -0,0 +1 @@
+Chris Double
diff --git a/extra/cpu/8080/emulator/summary.txt b/extra/cpu/8080/emulator/summary.txt
new file mode 100644
index 0000000000..083492dfc4
--- /dev/null
+++ b/extra/cpu/8080/emulator/summary.txt
@@ -0,0 +1 @@
+Intel 8080 CPU Emulator
diff --git a/extra/cpu/8080/emulator/tags.txt b/extra/cpu/8080/emulator/tags.txt
new file mode 100644
index 0000000000..86069f7680
--- /dev/null
+++ b/extra/cpu/8080/emulator/tags.txt
@@ -0,0 +1 @@
+emulator
diff --git a/extra/cpu/8080/summary.txt b/extra/cpu/8080/summary.txt
new file mode 100644
index 0000000000..083492dfc4
--- /dev/null
+++ b/extra/cpu/8080/summary.txt
@@ -0,0 +1 @@
+Intel 8080 CPU Emulator
diff --git a/extra/cpu/8080/tags.txt b/extra/cpu/8080/tags.txt
new file mode 100644
index 0000000000..86069f7680
--- /dev/null
+++ b/extra/cpu/8080/tags.txt
@@ -0,0 +1 @@
+emulator
diff --git a/extra/lunar-rescue/lunar-rescue-docs.factor b/extra/lunar-rescue/lunar-rescue-docs.factor
index 7755415b1a..d54fe7d485 100644
--- a/extra/lunar-rescue/lunar-rescue-docs.factor
+++ b/extra/lunar-rescue/lunar-rescue-docs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: help.syntax help.markup cpu.8080 ;
+USING: help.syntax help.markup cpu.8080.emulator ;
 IN: lunar-rescue 
 
 HELP: run