diff --git a/config/rootfiles/common/armv5tel/perl-Apache-Htpasswd b/config/rootfiles/common/armv5tel/perl-Apache-Htpasswd
deleted file mode 100644
index 2eb360ec1..000000000
--- a/config/rootfiles/common/armv5tel/perl-Apache-Htpasswd
+++ /dev/null
@@ -1,6 +0,0 @@
-#usr/lib/perl5/site_perl/5.12.3/Apache
-usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm
-#usr/lib/perl5/site_perl/5.12.3/armv5tel-linux-thread-multi/auto/Apache
-#usr/lib/perl5/site_perl/5.12.3/armv5tel-linux-thread-multi/auto/Apache/Htpasswd
-#usr/lib/perl5/site_perl/5.12.3/armv5tel-linux-thread-multi/auto/Apache/Htpasswd/.packlist
-#usr/share/man/man3/Apache::Htpasswd.3
diff --git a/config/rootfiles/common/i586/perl-Apache-Htpasswd b/config/rootfiles/common/i586/perl-Apache-Htpasswd
deleted file mode 100644
index 7eb356f20..000000000
--- a/config/rootfiles/common/i586/perl-Apache-Htpasswd
+++ /dev/null
@@ -1,6 +0,0 @@
-#usr/lib/perl5/site_perl/5.12.3/Apache
-usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Apache
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Apache/Htpasswd
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Apache/Htpasswd/.packlist
-#usr/share/man/man3/Apache::Htpasswd.3
diff --git a/config/rootfiles/common/perl-Apache-Htpasswd b/config/rootfiles/common/perl-Apache-Htpasswd
new file mode 100644
index 000000000..8b25483fc
--- /dev/null
+++ b/config/rootfiles/common/perl-Apache-Htpasswd
@@ -0,0 +1,6 @@
+#usr/lib/perl5/site_perl/5.12.3/Apache
+usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Apache
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Apache/Htpasswd
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Apache/Htpasswd/.packlist
+#usr/share/man/man3/Apache::Htpasswd.3
diff --git a/config/rootfiles/common/x86_64/perl-Apache-Htpasswd b/config/rootfiles/common/x86_64/perl-Apache-Htpasswd
deleted file mode 100644
index da58e5ee3..000000000
--- a/config/rootfiles/common/x86_64/perl-Apache-Htpasswd
+++ /dev/null
@@ -1,6 +0,0 @@
-#usr/lib/perl5/site_perl/5.12.3/Apache
-usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm
-#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Apache
-#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Apache/Htpasswd
-#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Apache/Htpasswd/.packlist
-#usr/share/man/man3/Apache::Htpasswd.3