diff --git a/deb/index_files.go b/deb/index_files.go
index a1abeaec..a1eb0015 100644
--- a/deb/index_files.go
+++ b/deb/index_files.go
@@ -167,7 +167,7 @@ func (files *indexFiles) PackageIndex(component, arch string, udeb bool) *indexF
 
 		file = &indexFile{
 			parent:       files,
-			discardable:  udeb,
+			discardable:  false,
 			compressable: true,
 			signable:     false,
 			relativePath: relativePath,
diff --git a/deb/publish.go b/deb/publish.go
index 22b81e21..0083516f 100644
--- a/deb/publish.go
+++ b/deb/publish.go
@@ -521,6 +521,11 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
 		udebs := []bool{false}
 		if hadUdebs {
 			udebs = append(udebs, true)
+
+			// For all architectures, pregenerate .udeb indexes
+			for _, arch := range p.Architectures {
+				indexes.PackageIndex(component, arch, true)
+			}
 		}
 
 		// For all architectures, generate Release files