diff -r 5c4d5a9885cc -r e67200166127 components/mailman/mailman.p5m
--- a/components/mailman/mailman.p5m	Thu Sep 03 09:24:16 2015 -0700
+++ b/components/mailman/mailman.p5m	Thu Sep 03 12:44:05 2015 -0700
@@ -68,8 +68,8 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2014/296
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file mailman.conf path=etc/apache2/2.2/samples-conf.d/mailman.conf
-file mailman.conf path=etc/apache2/2.4/samples-conf.d/mailman.conf
+file mailman.conf-2.2 path=etc/apache2/2.2/samples-conf.d/mailman.conf
+file mailman.conf-2.4 path=etc/apache2/2.4/samples-conf.d/mailman.conf
 file usr/lib/mailman/Mailman/mm_cfg.py path=etc/mailman/mm_cfg.py \
     owner=mailman group=mailman mode=0644 overlay=allow preserve=true
 file usr/lib/mailman/Mailman/mm_cfg.pyc path=etc/mailman/mm_cfg.pyc \