diff --git a/specs/2004.3/x86/athlon-xp-stage2.spec b/specs/2004.3/x86/athlon-xp-stage2.spec
new file mode 100644
index 00000000..ade90795
--- /dev/null
+++ b/specs/2004.3/x86/athlon-xp-stage2.spec
@@ -0,0 +1,8 @@
+subarch: athlon-xp
+target: stage2
+version_stamp: 2004.3
+rel_type: default
+rel_version: 2004.3
+profile: default-linux/x86/2004.3
+snapshot: 20041022
+source_subpath: default/stage1-x86-2004.3
diff --git a/specs/2004.3/x86/athlon-xp-stage3.spec b/specs/2004.3/x86/athlon-xp-stage3.spec
new file mode 100644
index 00000000..be6ac30f
--- /dev/null
+++ b/specs/2004.3/x86/athlon-xp-stage3.spec
@@ -0,0 +1,8 @@
+subarch: athlon-xp
+target: stage3
+version_stamp: 2004.3
+rel_type: default
+rel_version: 2004.3
+profile: default-linux/x86/2004.3
+snapshot: 20041022
+source_subpath: default/stage2-athlon-xp-2004.3
diff --git a/specs/2004.3/x86/i686-stage2.spec b/specs/2004.3/x86/i686-stage2.spec
new file mode 100644
index 00000000..55e6ab19
--- /dev/null
+++ b/specs/2004.3/x86/i686-stage2.spec
@@ -0,0 +1,8 @@
+subarch: i686
+target: stage2
+version_stamp: 2004.3
+rel_type: default
+rel_version: 2004.3
+profile: default-linux/x86/2004.3
+snapshot: 20041022
+source_subpath: default/stage1-x86-2004.3
diff --git a/specs/2004.3/x86/i686-stage3.spec b/specs/2004.3/x86/i686-stage3.spec
new file mode 100644
index 00000000..1df011c8
--- /dev/null
+++ b/specs/2004.3/x86/i686-stage3.spec
@@ -0,0 +1,8 @@
+subarch: i686
+target: stage3
+version_stamp: 2004.3
+rel_type: default
+rel_version: 2004.3
+profile: default-linux/x86/2004.3
+snapshot: 20041022
+source_subpath: default/stage2-i686-2004.3
diff --git a/specs/2004.3/x86/p3-stage2.spec b/specs/2004.3/x86/p3-stage2.spec
new file mode 100644
index 00000000..826921c3
--- /dev/null
+++ b/specs/2004.3/x86/p3-stage2.spec
@@ -0,0 +1,8 @@
+subarch: pentium3
+target: stage2
+version_stamp: 2004.3
+rel_type: default
+rel_version: 2004.3
+profile: default-linux/x86/2004.3
+snapshot: 20041022
+source_subpath: default/stage1-x86-2004.3
diff --git a/specs/2004.3/x86/p3-stage3.spec b/specs/2004.3/x86/p3-stage3.spec
new file mode 100644
index 00000000..c83a0bb9
--- /dev/null
+++ b/specs/2004.3/x86/p3-stage3.spec
@@ -0,0 +1,8 @@
+subarch: pentium3
+target: stage3
+version_stamp: 2004.3
+rel_type: default
+rel_version: 2004.3
+profile: default-linux/x86/2004.3
+snapshot: 20041022
+source_subpath: default/stage2-pentium3-2004.3
diff --git a/specs/2004.3/x86/p4-stage2.spec b/specs/2004.3/x86/p4-stage2.spec
new file mode 100644
index 00000000..be8db8da
--- /dev/null
+++ b/specs/2004.3/x86/p4-stage2.spec
@@ -0,0 +1,8 @@
+subarch: pentium4
+target: stage2
+version_stamp: 2004.3
+rel_type: default
+rel_version: 2004.3
+profile: default-linux/x86/2004.3
+snapshot: 20041022
+source_subpath: default/stage1-x86-2004.3
diff --git a/specs/2004.3/x86/p4-stage3.spec b/specs/2004.3/x86/p4-stage3.spec
new file mode 100644
index 00000000..fa5b9793
--- /dev/null
+++ b/specs/2004.3/x86/p4-stage3.spec
@@ -0,0 +1,8 @@
+subarch: pentium4
+target: stage3
+version_stamp: 2004.3
+rel_type: default
+rel_version: 2004.3
+profile: default-linux/x86/2004.3
+snapshot: 20041022
+source_subpath: default/stage2-pentium4-2004.3
diff --git a/specs/2004.3/x86/snapshot.spec b/specs/2004.3/x86/snapshot.spec
new file mode 100644
index 00000000..8003852e
--- /dev/null
+++ b/specs/2004.3/x86/snapshot.spec
@@ -0,0 +1,3 @@
+target: snapshot
+version_stamp: 20041022
+
diff --git a/specs/2004.3/x86/stage1.spec b/specs/2004.3/x86/x86-stage1.spec
similarity index 59%
rename from specs/2004.3/x86/stage1.spec
rename to specs/2004.3/x86/x86-stage1.spec
index 78109984..0f8c7041 100644
--- a/specs/2004.3/x86/stage1.spec
+++ b/specs/2004.3/x86/x86-stage1.spec
@@ -1,7 +1,8 @@
 subarch: x86
-version_stamp: 2004.3
 target: stage1
+version_stamp: 2004.3
 rel_type: default
-snapshot: 20041022
+rel_version: 2004.3
 profile: default-linux/x86/2004.3
-source_subpath: stage2-x86-20040920
+snapshot: 20041022
+source_subpath: default-x86-2004.2/stage3-x86-2004.3.20040920
diff --git a/specs/2004.3/x86/stage2.spec b/specs/2004.3/x86/x86-stage2.spec
similarity index 78%
rename from specs/2004.3/x86/stage2.spec
rename to specs/2004.3/x86/x86-stage2.spec
index f86a18a0..df98f6d3 100644
--- a/specs/2004.3/x86/stage2.spec
+++ b/specs/2004.3/x86/x86-stage2.spec
@@ -1,8 +1,8 @@
 subarch: x86
-version_stamp: 2004.3
 target: stage2
+version_stamp: 2004.3
 rel_type: default
-snapshot: 20041022
-distcc_hosts: localhost/3 gravity/3 orion/3
+rel_version: 2004.3
 profile: default-linux/x86/2004.3
+snapshot: 20041022
 source_subpath: default/stage1-x86-2004.3
diff --git a/specs/2004.3/x86/stage3.spec b/specs/2004.3/x86/x86-stage3.spec
similarity index 78%
rename from specs/2004.3/x86/stage3.spec
rename to specs/2004.3/x86/x86-stage3.spec
index 34074127..dfeecf02 100644
--- a/specs/2004.3/x86/stage3.spec
+++ b/specs/2004.3/x86/x86-stage3.spec
@@ -1,8 +1,8 @@
 subarch: x86
-version_stamp: 2004.3
 target: stage3
+version_stamp: 2004.3
 rel_type: default
-snapshot: 20041022
-distcc_hosts: localhost/3 gravity/3 orion/3
+rel_version: 2004.3
 profile: default-linux/x86/2004.3
+snapshot: 20041022
 source_subpath: default/stage2-x86-2004.3