--- a/components/stunnel/stunnel.p5m	Thu Mar 16 10:58:11 2017 -0700
+++ b/components/stunnel/stunnel.p5m	Mon Mar 20 04:53:52 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -41,8 +41,8 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file auth_stunnel path=etc/security/auth_attr.d/stunnel
 file prof_stunnel path=etc/security/prof_attr.d/stunnel
-file tools/stunnel.conf-sample.in path=etc/stunnel/stunnel.conf
-file path=etc/stunnel/stunnel.pem
+file etc/stunnel/stunnel.conf-sample path=etc/stunnel/stunnel.conf \
+    overlay=allow preserve=renamenew
 file stunnel.xml path=lib/svc/manifest/network/ssl/stunnel.xml
 file path=usr/bin/$(MACH64)/stunnel
 file path=usr/bin/stunnel