diff --git a/deb/format.go b/deb/format.go
index b16889c3..938ff7dc 100644
--- a/deb/format.go
+++ b/deb/format.go
@@ -16,6 +16,7 @@ var (
 	canonicalOrderRelease = []string{
 		"Origin",
 		"Label",
+		"Archive",
 		"Suite",
 		"Version",
 		"Codename",
diff --git a/system/t06_publish/PublishSnapshot1Test_release_amd64 b/system/t06_publish/PublishSnapshot1Test_release_amd64
index 540b0bdc..7fe2102a 100644
--- a/system/t06_publish/PublishSnapshot1Test_release_amd64
+++ b/system/t06_publish/PublishSnapshot1Test_release_amd64
@@ -1,5 +1,5 @@
 Origin: . maverick
 Label: . maverick
+Component: main
 Archive: maverick
 Architecture: amd64
-Component: main
diff --git a/system/t06_publish/PublishSnapshot1Test_release_i386 b/system/t06_publish/PublishSnapshot1Test_release_i386
index e76a8da1..48a4fa32 100644
--- a/system/t06_publish/PublishSnapshot1Test_release_i386
+++ b/system/t06_publish/PublishSnapshot1Test_release_i386
@@ -1,5 +1,5 @@
 Origin: . maverick
 Label: . maverick
+Archive: maverick
 Architecture: i386
 Component: main
-Archive: maverick
diff --git a/system/t06_publish/PublishSnapshot35Test_release_udeb_i386 b/system/t06_publish/PublishSnapshot35Test_release_udeb_i386
index b00dab38..fb7bf175 100644
--- a/system/t06_publish/PublishSnapshot35Test_release_udeb_i386
+++ b/system/t06_publish/PublishSnapshot35Test_release_udeb_i386
@@ -1,5 +1,5 @@
 Origin: . squeeze
 Label: . squeeze
+Component: main
 Archive: squeeze
 Architecture: i386
-Component: main