--- a/components/sendmail/sendmail.p5m	Mon Feb 22 14:53:24 2016 -0800
+++ b/components/sendmail/sendmail.p5m	Mon Feb 22 16:08:11 2016 -0800
@@ -20,14 +20,17 @@
 #
 
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; set the hash to
 # point to the files therein.
 <transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<1> >
-# Set the hash for the cf/ hierarchy similarly.
+# Transforms to work around config stuff coming from difference places.
+<transform file -> set originalhash %(action.hash)>
 <transform file path=etc/mail/(cf/.+)$ -> set action.hash %<1> >
+<transform file originalhash=^(?!NOHASH).+$ -> set action.hash %(originalhash) >
+<transform file -> delete originalhash .*>
 # Bypass the mangler for these files because they are pre-Solarified.
 <transform file path=usr/share/man/.+$ -> add mangler.bypass true >
 <transform file path=etc/mail/cf/.* -> default group mail>
@@ -53,7 +56,7 @@
 file aliases path=etc/mail/aliases mode=0644 \
     original_name=SUNWsndm:etc/mail/aliases preserve=true
 file path=etc/mail/cf/README
-file path=etc/mail/cf/cf/Makefile
+file files/cf/cf/Makefile path=etc/mail/cf/cf/Makefile
 link path=etc/mail/cf/cf/main.cf target=sendmail.cf
 link path=etc/mail/cf/cf/main.mc target=sendmail.mc
 file path=etc/mail/cf/cf/sendmail.cf