diff --git a/sysutils/cfengine3-legacy/pkg-plist b/sysutils/cfengine3-legacy/pkg-plist
index 544d8115e687..3f3949958447 100644
--- a/sysutils/cfengine3-legacy/pkg-plist
+++ b/sysutils/cfengine3-legacy/pkg-plist
@@ -14,17 +14,20 @@ sbin/cf-serverd
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/NEWS
 %%DOCSDIR%%/README
+%%DOCSDIR%%/cfengine_stdlib.cf
 %%DOCSDIR%%/inputs/failsafe.cf
 %%DOCSDIR%%/inputs/library.cf
 %%DOCSDIR%%/inputs/promises.cf
 %%DOCSDIR%%/inputs/site.cf
 %%DOCSDIR%%/inputs/update.cf
 %%DOCSDIR%%/promise_knowledge.cf
-%%DOCSDIR%%/unit-env.cf
 %%DOCSDIR%%/unit_accessed_before.cf
 %%DOCSDIR%%/unit_accumulated_time.cf
 %%DOCSDIR%%/unit_acl.cf
 %%DOCSDIR%%/unit_acl_generic.cf
+%%DOCSDIR%%/unit_acl_secret.cf
+%%DOCSDIR%%/unit_activedirectory_listusers.cf
+%%DOCSDIR%%/unit_activedirectory_showuser.cf
 %%DOCSDIR%%/unit_ago.cf
 %%DOCSDIR%%/unit_arrays.cf
 %%DOCSDIR%%/unit_backreferences_files.cf
@@ -42,11 +45,13 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_control_expand.cf
 %%DOCSDIR%%/unit_controlclasses.cf
 %%DOCSDIR%%/unit_copy.cf
+%%DOCSDIR%%/unit_copy_classes.cf
 %%DOCSDIR%%/unit_copy_edit.cf
 %%DOCSDIR%%/unit_copylinks.cf
+%%DOCSDIR%%/unit_countclassesmatching.cf
+%%DOCSDIR%%/unit_countlinesmatching.cf
 %%DOCSDIR%%/unit_create_filedir.cf
 %%DOCSDIR%%/unit_createdb.cf
-%%DOCSDIR%%/unit_countlinesmatching.cf
 %%DOCSDIR%%/unit_customize_by_named_list.cf
 %%DOCSDIR%%/unit_definitions.cf
 %%DOCSDIR%%/unit_deletelines.cf
@@ -56,6 +61,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_edit_column_files.cf
 %%DOCSDIR%%/unit_edit_comment_lines.cf
 %%DOCSDIR%%/unit_edit_deletenotmatch.cf
+%%DOCSDIR%%/unit_edit_insert_fuzzylines.cf
 %%DOCSDIR%%/unit_edit_insert_lines.cf
 %%DOCSDIR%%/unit_edit_insert_lines_silly.cf
 %%DOCSDIR%%/unit_edit_passwd_file.cf
@@ -63,7 +69,11 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_edit_sectioned_file.cf
 %%DOCSDIR%%/unit_edit_setvar.cf
 %%DOCSDIR%%/unit_edit_triggerclass.cf
+%%DOCSDIR%%/unit_env.cf
+%%DOCSDIR%%/unit_environment.cf
+%%DOCSDIR%%/unit_environment_simple.cf
 %%DOCSDIR%%/unit_epimenides.cf
+%%DOCSDIR%%/unit_escape.cf
 %%DOCSDIR%%/unit_exec_args.cf
 %%DOCSDIR%%/unit_exec_in_sequence.cf
 %%DOCSDIR%%/unit_execd.cf
@@ -78,6 +88,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_filesexist.cf
 %%DOCSDIR%%/unit_filesexist2.cf
 %%DOCSDIR%%/unit_fix_names.cf
+%%DOCSDIR%%/unit_getenv.cf
 %%DOCSDIR%%/unit_getfields.cf
 %%DOCSDIR%%/unit_getgid.cf
 %%DOCSDIR%%/unit_getindices.cf
@@ -116,7 +127,9 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_locate_files_and_compress.cf
 %%DOCSDIR%%/unit_log_private.cf
 %%DOCSDIR%%/unit_loops.cf
+%%DOCSDIR%%/unit_measure_log.cf
 %%DOCSDIR%%/unit_measurements.cf
+%%DOCSDIR%%/unit_menu.cf
 %%DOCSDIR%%/unit_method.cf
 %%DOCSDIR%%/unit_method_validate.cf
 %%DOCSDIR%%/unit_module_exec.cf
@@ -131,6 +144,8 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_package_apt.cf
 %%DOCSDIR%%/unit_package_freebsd.cf
 %%DOCSDIR%%/unit_package_hash.cf
+%%DOCSDIR%%/unit_package_msi_file.cf
+%%DOCSDIR%%/unit_package_msi_version.cf
 %%DOCSDIR%%/unit_package_rpm.cf
 %%DOCSDIR%%/unit_package_solaris.cf
 %%DOCSDIR%%/unit_package_yum.cf
@@ -148,10 +163,15 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_promises.cf
 %%DOCSDIR%%/unit_readlist.cf
 %%DOCSDIR%%/unit_readtcp.cf
+%%DOCSDIR%%/unit_reg_multiline.cf
 %%DOCSDIR%%/unit_regarray.cf
+%%DOCSDIR%%/unit_regex_win.cf
+%%DOCSDIR%%/unit_regextract.cf
 %%DOCSDIR%%/unit_registry.cf
+%%DOCSDIR%%/unit_registry_cache.cf
 %%DOCSDIR%%/unit_regline.cf
 %%DOCSDIR%%/unit_reglist.cf
+%%DOCSDIR%%/unit_remoteclasses.cf
 %%DOCSDIR%%/unit_remove_deadlinks.cf
 %%DOCSDIR%%/unit_rename.cf
 %%DOCSDIR%%/unit_report_custom.cf
@@ -166,27 +186,34 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_select_region.cf
 %%DOCSDIR%%/unit_select_size.cf
 %%DOCSDIR%%/unit_selectservers.cf
-%%DOCSDIR%%/unit_setvar.cf
 %%DOCSDIR%%/unit_server_copy_localhost.cf
 %%DOCSDIR%%/unit_server_copy_purge.cf
 %%DOCSDIR%%/unit_server_copy_remote.cf
 %%DOCSDIR%%/unit_server_flatcopy_localhost.cf
+%%DOCSDIR%%/unit_service_disable.cf
+%%DOCSDIR%%/unit_service_start.cf
 %%DOCSDIR%%/unit_setuidlog.cf
+%%DOCSDIR%%/unit_setvar.cf
 %%DOCSDIR%%/unit_splitstring.cf
 %%DOCSDIR%%/unit_sql.cf
 %%DOCSDIR%%/unit_storage.cf
 %%DOCSDIR%%/unit_strcmp.cf
 %%DOCSDIR%%/unit_stringarray.cf
+%%DOCSDIR%%/unit_switchcase.cf
 %%DOCSDIR%%/unit_syslog.cf
+%%DOCSDIR%%/unit_syslog2.cf
 %%DOCSDIR%%/unit_template.cf
 %%DOCSDIR%%/unit_tidy_all_files.cf
+%%DOCSDIR%%/unit_translatepath.cf
 %%DOCSDIR%%/unit_update.cf
 %%DOCSDIR%%/unit_user_edit.cf
 %%DOCSDIR%%/unit_user_edit_method.cf
 %%DOCSDIR%%/unit_userexists.cf
 %%DOCSDIR%%/unit_varclass.cf
+%%DOCSDIR%%/unit_varnet.cf
 %%DOCSDIR%%/unit_vars.cf
 %%DOCSDIR%%/unit_warnifline.cf
 %%DOCSDIR%%/unit_webserver.cf
+%%DOCSDIR%%/unit_zenoss.cf
 @dirrm %%DOCSDIR%%/inputs
 @dirrm %%DOCSDIR%%
diff --git a/sysutils/cfengine3/pkg-plist b/sysutils/cfengine3/pkg-plist
index 544d8115e687..3f3949958447 100644
--- a/sysutils/cfengine3/pkg-plist
+++ b/sysutils/cfengine3/pkg-plist
@@ -14,17 +14,20 @@ sbin/cf-serverd
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/NEWS
 %%DOCSDIR%%/README
+%%DOCSDIR%%/cfengine_stdlib.cf
 %%DOCSDIR%%/inputs/failsafe.cf
 %%DOCSDIR%%/inputs/library.cf
 %%DOCSDIR%%/inputs/promises.cf
 %%DOCSDIR%%/inputs/site.cf
 %%DOCSDIR%%/inputs/update.cf
 %%DOCSDIR%%/promise_knowledge.cf
-%%DOCSDIR%%/unit-env.cf
 %%DOCSDIR%%/unit_accessed_before.cf
 %%DOCSDIR%%/unit_accumulated_time.cf
 %%DOCSDIR%%/unit_acl.cf
 %%DOCSDIR%%/unit_acl_generic.cf
+%%DOCSDIR%%/unit_acl_secret.cf
+%%DOCSDIR%%/unit_activedirectory_listusers.cf
+%%DOCSDIR%%/unit_activedirectory_showuser.cf
 %%DOCSDIR%%/unit_ago.cf
 %%DOCSDIR%%/unit_arrays.cf
 %%DOCSDIR%%/unit_backreferences_files.cf
@@ -42,11 +45,13 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_control_expand.cf
 %%DOCSDIR%%/unit_controlclasses.cf
 %%DOCSDIR%%/unit_copy.cf
+%%DOCSDIR%%/unit_copy_classes.cf
 %%DOCSDIR%%/unit_copy_edit.cf
 %%DOCSDIR%%/unit_copylinks.cf
+%%DOCSDIR%%/unit_countclassesmatching.cf
+%%DOCSDIR%%/unit_countlinesmatching.cf
 %%DOCSDIR%%/unit_create_filedir.cf
 %%DOCSDIR%%/unit_createdb.cf
-%%DOCSDIR%%/unit_countlinesmatching.cf
 %%DOCSDIR%%/unit_customize_by_named_list.cf
 %%DOCSDIR%%/unit_definitions.cf
 %%DOCSDIR%%/unit_deletelines.cf
@@ -56,6 +61,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_edit_column_files.cf
 %%DOCSDIR%%/unit_edit_comment_lines.cf
 %%DOCSDIR%%/unit_edit_deletenotmatch.cf
+%%DOCSDIR%%/unit_edit_insert_fuzzylines.cf
 %%DOCSDIR%%/unit_edit_insert_lines.cf
 %%DOCSDIR%%/unit_edit_insert_lines_silly.cf
 %%DOCSDIR%%/unit_edit_passwd_file.cf
@@ -63,7 +69,11 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_edit_sectioned_file.cf
 %%DOCSDIR%%/unit_edit_setvar.cf
 %%DOCSDIR%%/unit_edit_triggerclass.cf
+%%DOCSDIR%%/unit_env.cf
+%%DOCSDIR%%/unit_environment.cf
+%%DOCSDIR%%/unit_environment_simple.cf
 %%DOCSDIR%%/unit_epimenides.cf
+%%DOCSDIR%%/unit_escape.cf
 %%DOCSDIR%%/unit_exec_args.cf
 %%DOCSDIR%%/unit_exec_in_sequence.cf
 %%DOCSDIR%%/unit_execd.cf
@@ -78,6 +88,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_filesexist.cf
 %%DOCSDIR%%/unit_filesexist2.cf
 %%DOCSDIR%%/unit_fix_names.cf
+%%DOCSDIR%%/unit_getenv.cf
 %%DOCSDIR%%/unit_getfields.cf
 %%DOCSDIR%%/unit_getgid.cf
 %%DOCSDIR%%/unit_getindices.cf
@@ -116,7 +127,9 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_locate_files_and_compress.cf
 %%DOCSDIR%%/unit_log_private.cf
 %%DOCSDIR%%/unit_loops.cf
+%%DOCSDIR%%/unit_measure_log.cf
 %%DOCSDIR%%/unit_measurements.cf
+%%DOCSDIR%%/unit_menu.cf
 %%DOCSDIR%%/unit_method.cf
 %%DOCSDIR%%/unit_method_validate.cf
 %%DOCSDIR%%/unit_module_exec.cf
@@ -131,6 +144,8 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_package_apt.cf
 %%DOCSDIR%%/unit_package_freebsd.cf
 %%DOCSDIR%%/unit_package_hash.cf
+%%DOCSDIR%%/unit_package_msi_file.cf
+%%DOCSDIR%%/unit_package_msi_version.cf
 %%DOCSDIR%%/unit_package_rpm.cf
 %%DOCSDIR%%/unit_package_solaris.cf
 %%DOCSDIR%%/unit_package_yum.cf
@@ -148,10 +163,15 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_promises.cf
 %%DOCSDIR%%/unit_readlist.cf
 %%DOCSDIR%%/unit_readtcp.cf
+%%DOCSDIR%%/unit_reg_multiline.cf
 %%DOCSDIR%%/unit_regarray.cf
+%%DOCSDIR%%/unit_regex_win.cf
+%%DOCSDIR%%/unit_regextract.cf
 %%DOCSDIR%%/unit_registry.cf
+%%DOCSDIR%%/unit_registry_cache.cf
 %%DOCSDIR%%/unit_regline.cf
 %%DOCSDIR%%/unit_reglist.cf
+%%DOCSDIR%%/unit_remoteclasses.cf
 %%DOCSDIR%%/unit_remove_deadlinks.cf
 %%DOCSDIR%%/unit_rename.cf
 %%DOCSDIR%%/unit_report_custom.cf
@@ -166,27 +186,34 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_select_region.cf
 %%DOCSDIR%%/unit_select_size.cf
 %%DOCSDIR%%/unit_selectservers.cf
-%%DOCSDIR%%/unit_setvar.cf
 %%DOCSDIR%%/unit_server_copy_localhost.cf
 %%DOCSDIR%%/unit_server_copy_purge.cf
 %%DOCSDIR%%/unit_server_copy_remote.cf
 %%DOCSDIR%%/unit_server_flatcopy_localhost.cf
+%%DOCSDIR%%/unit_service_disable.cf
+%%DOCSDIR%%/unit_service_start.cf
 %%DOCSDIR%%/unit_setuidlog.cf
+%%DOCSDIR%%/unit_setvar.cf
 %%DOCSDIR%%/unit_splitstring.cf
 %%DOCSDIR%%/unit_sql.cf
 %%DOCSDIR%%/unit_storage.cf
 %%DOCSDIR%%/unit_strcmp.cf
 %%DOCSDIR%%/unit_stringarray.cf
+%%DOCSDIR%%/unit_switchcase.cf
 %%DOCSDIR%%/unit_syslog.cf
+%%DOCSDIR%%/unit_syslog2.cf
 %%DOCSDIR%%/unit_template.cf
 %%DOCSDIR%%/unit_tidy_all_files.cf
+%%DOCSDIR%%/unit_translatepath.cf
 %%DOCSDIR%%/unit_update.cf
 %%DOCSDIR%%/unit_user_edit.cf
 %%DOCSDIR%%/unit_user_edit_method.cf
 %%DOCSDIR%%/unit_userexists.cf
 %%DOCSDIR%%/unit_varclass.cf
+%%DOCSDIR%%/unit_varnet.cf
 %%DOCSDIR%%/unit_vars.cf
 %%DOCSDIR%%/unit_warnifline.cf
 %%DOCSDIR%%/unit_webserver.cf
+%%DOCSDIR%%/unit_zenoss.cf
 @dirrm %%DOCSDIR%%/inputs
 @dirrm %%DOCSDIR%%