--- a/components/foomatic/db-engine/foomatic-db-engine.p5m	Mon Mar 21 13:11:55 2016 -0700
+++ b/components/foomatic/db-engine/foomatic-db-engine.p5m	Mon Mar 21 13:57:26 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -45,15 +45,14 @@
 file path=usr/bin/foomatic-searchprinter
 link path=usr/lib/cups/driver/foomatic \
     target=../../../../usr/bin/foomatic-ppdfile
-file path=usr/perl5/5.12/lib/$(PERL_ARCH)/perllocal.pod
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Foomatic/.packlist
-file path=usr/perl5/vendor_perl/5.12/Foomatic/DB.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Foomatic/.packlist
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/DB.pm
 # Defaults.pm are not built by the perl module, but by external utility, so it's in
 # wrong place
 file $(MACH32)/lib/Foomatic/Defaults.pm \
-    path=usr/perl5/vendor_perl/5.12/Foomatic/Defaults.pm
-file path=usr/perl5/vendor_perl/5.12/Foomatic/PPD.pm
-file path=usr/perl5/vendor_perl/5.12/Foomatic/UIElem.pm
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/Defaults.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/PPD.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/UIElem.pm
 file path=usr/sbin/foomatic-addpjloptions
 file path=usr/sbin/foomatic-cleanupdrivers
 file path=usr/sbin/foomatic-extract-text