diff --git a/Keywords/sample.ucl b/Keywords/sample.ucl
index 981f885..2b1a46c 100644
--- a/Keywords/sample.ucl
+++ b/Keywords/sample.ucl
@@ -1,10 +1,10 @@
 # $FreeBSD: head/Keywords/sample.ucl 417335 2016-06-22 21:44:25Z bapt $
 #
-# MAINTAINER: portmgr@FreeBSD.org
-#
 # @sample etc/somefile.conf.sample
 # or
-# @sample file1 file2
+# @sample sample-file target-file
+# or
+# @sample sample-file target-file owner group mode
 #
 # Where file1 is considered as a sample file and file2 the target file
 #
@@ -27,8 +27,12 @@ post-install: <<EOD
   esac
   target_file="${sample_file%.sample}"
   set -- %@
-  if [ $# -eq 2 ]; then
+  change_mode=0
+  if [ $# -ge 2 ]; then
       target_file=${2}
+      if [ $# -eq 5 ] then
+         change_mode=1
+      fi
   fi
   case "${target_file}" in
   /*) target_file="${target_file}" ;;
@@ -36,6 +40,17 @@ post-install: <<EOD
   esac
   if ! [ -f "${target_file}" ]; then
     /bin/cp -p "${sample_file}" "${target_file}"
+    if [ change_mode -eq 1 ]; then
+       if [ "${3}" != "," ]; then
+          /bin/chown "${3}" "${target_file}"
+       fi
+       if [ "${4}" != "," ]; then
+          /bin/chgrp "${4}" "${target_file}"
+       fi
+       if [ "${5}" != "," ]; then
+          /bin/chmod "${5}" "${target_file}"
+       fi
+    fi
   fi
 EOD
 pre-deinstall: <<EOD
diff --git a/mk/pkgformat/pkgng/package.mk b/mk/pkgformat/pkgng/package.mk
index d82024e..5fdbb0b 100644
--- a/mk/pkgformat/pkgng/package.mk
+++ b/mk/pkgformat/pkgng/package.mk
@@ -67,7 +67,11 @@ ${WRKDIR}/.created_fixed_dirs:
 	${RUN}${TOUCH} ${.TARGET}
 
 ${PLIST_PKGNG}: ${WRKDIR}/.created_fixed_dirs ${PLIST}
-	${AWK} -vPREFIX="${PREFIX}" -vCONF_FILES="${CONF_FILES} ${REQD_FILES}" \
+	${AWK} -vPREFIX="${PREFIX}" \
+		-vREQD_FILES="${REQD_FILES}" \
+		-vREQD_FILES_MODE="${REQD_FILES_MODE}" \
+		-vCONF_FILES="${CONF_FILES}" \
+		-vCONF_FILES_MODE="${CONF_FILES_MODE}" \
 		-vCONF_FILES_PERMS="${CONF_FILES_PERMS} ${REQD_FILES_PERMS}" \
 		-f  ${PKGSRCDIR}/mk/pkgformat/pkgng/transform_plist.awk \
 		${PLIST} > ${.TARGET}
diff --git a/mk/pkgformat/pkgng/transform_plist.awk b/mk/pkgformat/pkgng/transform_plist.awk
index 14490b6..1325eef 100644
--- a/mk/pkgformat/pkgng/transform_plist.awk
+++ b/mk/pkgformat/pkgng/transform_plist.awk
@@ -2,7 +2,10 @@
 #  external variables:
 #  -------------------
 #  CONF_FILES= space delimited list of sample files (2 per)
-#  CONF_FILES_PERMS= similar with perms (5 per)
+#  CONF_FILES_PERMS= similar with perms (5 per), include REQD_FILES_PERMS
+#  CONF_FILES_MODE= set mode for all CONF_FILES
+#  REQD_FILES= handle like CONF_FILES
+#  REQD_FILES_MODE = set mode of all REQD_FILES
 #  PREFIX= installation prefix
 #  
 #
@@ -10,17 +13,32 @@
 BEGIN {
     split (CONF_FILES, CF);
     num_CF = length(CF) / 2;
-    for (k = 1; k <= num_CF; k++) used_CF[k] = 0;
+    for (k = 0; k < num_CF; k++) used_CF[k] = 0;
+
+    split (REQD_FILES, RF);
+    num_RF = length(RF) / 2;
+    for (k = 0; k < num_RF; k++) used_RF[k] = 0;
 
     split (CONF_FILES_PERMS, CFP);
     num_CFP = length(CFP) / 5;
-    for (k = 1; k <= num_CFP; k++) used_CFP[k] = 0;
+    for (k = 0; k < num_CFP; k++) used_CFP[k] = 0;
 }
 
 END {
-    for (k = 1; k <= num_CF; k++) {
+    for (k = 0; k < num_CF; k++) {
        if (!used_CF[k]) {
-          print "sample@ " CF[k*2-1] " " CF[k*2];
+          if (CONF_FILES_MODE == "")
+             print "@sample " CF[2*k+1] " " CF[2*k+2];
+          else
+             print "@sample " CF[2*k+1] " " CF[2*k+2] " , , " CONF_FILES_MODE
+       }
+    }
+    for (k = 0; k < num_RF; k++) {
+       if (!used_RF[k]) {
+          if (REQD_FILES_MODE == "")
+             print "@sample " RF[2*k+1] " " RF[2*k+2];
+          else
+             print "@sample " RF[2*k+1] " " RF[2*k+2] " , , " REQD_FILES_MODE
        }
     }
     for (k = 0; k < num_CFP; k++) {
@@ -32,11 +50,26 @@ END {
 
 function is_sample () {
     candidate = PREFIX "/" $1
-    for (k = 1; k <= num_CF; k++) {
+    for (k = 0; k < num_CF; k++) {
        if (!used_CF[k]) {
-          if (candidate == CF[k*2-1]) {
+          if (candidate == CF[2*k+1]) {
              used_CF[k] = 1;
-             print "@sample " CF[k*2-1] " " CF[k*2];
+             if (CONF_FILES_MODE == "")
+                print "@sample " CF[2*k+1] " " CF[2*k+2];
+             else
+                print "@sample " CF[2*k+1] " " CF[2*k+2] " , , " CONF_FILES_MODE
+             return 1;
+          }
+       }
+    }
+    for (k = 0; k < num_RF; k++) {
+       if (!used_RF[k]) {
+          if (candidate == RF[2*k+1]) {
+             used_RF[k] = 1;
+             if (REQD_FILES_MODE == "")
+                print "@sample " RF[2*k+1] " " RF[2*k+2];
+             else
+                print "@sample " RF[2*k+1] " " RF[2*k+2] " , , " REQD_FILES_MODE
              return 1;
           }
        }
diff --git a/mk/pkginstall/install b/mk/pkginstall/install
index 0304b4e..20b304f 100644
--- a/mk/pkginstall/install
+++ b/mk/pkginstall/install
@@ -3,10 +3,6 @@
 case ${STAGE} in
 PRE-INSTALL)
 	#
-	# Unpack the helper scriptlets.
-	#
-	${SH} ${SELF} ${PKGNAME} UNPACK
-	#
 	# Require that necessary users and groups exist or else fail the
 	# installation of the package.
 	#
@@ -17,10 +13,6 @@ PRE-INSTALL)
 		  else
 			exit 1
 		  fi; }
-	${TEST} ! -x ./+DIRS ||
-		./+DIRS ADD ${PKG_METADATA_DIR}
-	${TEST} ! -x ./+DIRS ||
-		./+DIRS PERMS ${PKG_METADATA_DIR}
         ;;
 
 POST-INSTALL)
@@ -49,10 +41,6 @@ POST-INSTALL)
 
 	# Check for any missing bits after we're finished installing.
 	#
-	${TEST} ! -x ./+DIRS ||
-		./+DIRS CHECK-ADD ${PKG_METADATA_DIR}
-	${TEST} ! -x ./+DIRS ||
-		./+DIRS CHECK-PERMS ${PKG_METADATA_DIR}
 	${TEST} ! -x ./+FILES ||
 		./+FILES CHECK-ADD ${PKG_METADATA_DIR}
 	${TEST} ! -x ./+FILES ||
@@ -65,11 +53,6 @@ POST-INSTALL)
 		./+SHELL ADD ${PKG_METADATA_DIR}
 	${TEST} ! -x ./+SHELL ||
 		./+SHELL CHECK-ADD ${PKG_METADATA_DIR}
-	#
-	# Register info files.
-	#
-	${TEST} ! -x ./+INFO_FILES ||
-		./+INFO_FILES ADD ${PKG_METADATA_DIR}
 
   #
   # Register package into ocaml-findlib.