3 files changed, 435 insertions, 9 deletions

diff --git a/sysutils/virtualmin/Makefile b/sysutils/virtualmin/Makefile
index ac094e6395cf..2606fe21142c 100644
--- a/sysutils/virtualmin/Makefile
+++ b/sysutils/virtualmin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	virtualmin
-PORTVERSION=	3.60
+PORTVERSION=	3.61
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/download/virtualmin/
 DISTNAME=	virtual-server-${PORTVERSION}.gpl
diff --git a/sysutils/virtualmin/distinfo b/sysutils/virtualmin/distinfo
index fb3751353a88..c95e6424f563 100644
--- a/sysutils/virtualmin/distinfo
+++ b/sysutils/virtualmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (virtual-server-3.60.gpl.wbm.gz) = 3b7ab0cbc690a32216fe4ab1a87efd44
-SHA256 (virtual-server-3.60.gpl.wbm.gz) = feee49c8859719bcbddefc34c7a2e7ab3c47d1fd97988b8443b828b0275c75d9
-SIZE (virtual-server-3.60.gpl.wbm.gz) = 992816
+MD5 (virtual-server-3.61.gpl.wbm.gz) = 4a6148494910ca964891d2920dcd73ba
+SHA256 (virtual-server-3.61.gpl.wbm.gz) = a4e3210e1bad3327a1c53f3d764a29b48fcdaec5cb76479857dd01977226967c
+SIZE (virtual-server-3.61.gpl.wbm.gz) = 1074428
diff --git a/sysutils/virtualmin/pkg-plist b/sysutils/virtualmin/pkg-plist
index 18f2a39e3421..66448463e095 100644
--- a/sysutils/virtualmin/pkg-plist
+++ b/sysutils/virtualmin/pkg-plist
@@ -17,10 +17,12 @@ lib/webmin/virtual-server/bwgraph.cgi
 lib/webmin/virtual-server/cert_form.cgi
 lib/webmin/virtual-server/change-password.pl
 lib/webmin/virtual-server/change_users.cgi
+lib/webmin/virtual-server/check-config.pl
 lib/webmin/virtual-server/check.cgi
 lib/webmin/virtual-server/clam-wrapper.pl
 lib/webmin/virtual-server/collect-lib.pl
 lib/webmin/virtual-server/collectinfo.pl
+lib/webmin/virtual-server/commands-lib.pl
 lib/webmin/virtual-server/config
 lib/webmin/virtual-server/config-freebsd
 lib/webmin/virtual-server/config.info
@@ -68,6 +70,7 @@ lib/webmin/virtual-server/edit_newchroot.cgi
 lib/webmin/virtual-server/edit_newdynip.cgi
 lib/webmin/virtual-server/edit_newfeatures.cgi
 lib/webmin/virtual-server/edit_newfields.cgi
+lib/webmin/virtual-server/edit_newglobal.cgi
 lib/webmin/virtual-server/edit_newlocal.cgi
 lib/webmin/virtual-server/edit_newquotacheck.cgi
 lib/webmin/virtual-server/edit_newsharedips.cgi
@@ -109,28 +112,249 @@ lib/webmin/virtual-server/feature-webalizer.pl
 lib/webmin/virtual-server/feature-webmin.pl
 lib/webmin/virtual-server/frame_form.cgi
 lib/webmin/virtual-server/framefwd-template
+lib/webmin/virtual-server/help/admin_create.html
+lib/webmin/virtual-server/help/admin_desc.html
+lib/webmin/virtual-server/help/admin_edit.html
+lib/webmin/virtual-server/help/admin_email.html
+lib/webmin/virtual-server/help/admin_features.html
+lib/webmin/virtual-server/help/admin_modules.html
+lib/webmin/virtual-server/help/admin_name.html
+lib/webmin/virtual-server/help/admin_pass.html
+lib/webmin/virtual-server/help/admin_rename.html
+lib/webmin/virtual-server/help/aedit.html
+lib/webmin/virtual-server/help/alias_auto.html
+lib/webmin/virtual-server/help/alias_bounce.html
+lib/webmin/virtual-server/help/alias_end.html
+lib/webmin/virtual-server/help/alias_forward.html
+lib/webmin/virtual-server/help/alias_from.html
+lib/webmin/virtual-server/help/alias_local.html
+lib/webmin/virtual-server/help/alias_period.html
+lib/webmin/virtual-server/help/alias_start.html
+lib/webmin/virtual-server/help/aliascmt.html
 lib/webmin/virtual-server/help/aliasdest.html
+lib/webmin/virtual-server/help/aliaslimit.html
 lib/webmin/virtual-server/help/aliasname.html
+lib/webmin/virtual-server/help/aliasname2.html
+lib/webmin/virtual-server/help/amass.html
+lib/webmin/virtual-server/help/backup_dest.html
+lib/webmin/virtual-server/help/backup_doms.html
+lib/webmin/virtual-server/help/backup_email.html
+lib/webmin/virtual-server/help/backup_errors.html
+lib/webmin/virtual-server/help/backup_features.html
+lib/webmin/virtual-server/help/backup_fmt.html
+lib/webmin/virtual-server/help/backup_format.html
+lib/webmin/virtual-server/help/backup_increment.html
+lib/webmin/virtual-server/help/backup_mkdir.html
+lib/webmin/virtual-server/help/backup_onebyone.html
+lib/webmin/virtual-server/help/backup_parent.html
+lib/webmin/virtual-server/help/backup_parent2.html
+lib/webmin/virtual-server/help/backup_purge.html
+lib/webmin/virtual-server/help/backup_strftime.html
+lib/webmin/virtual-server/help/backup_virtualmin.html
+lib/webmin/virtual-server/help/backup_when.html
+lib/webmin/virtual-server/help/balancers.html
+lib/webmin/virtual-server/help/bandwidth.html
+lib/webmin/virtual-server/help/bandwidth_bw_active.html
+lib/webmin/virtual-server/help/bandwidth_bw_disable.html
+lib/webmin/virtual-server/help/bandwidth_bw_email.html
+lib/webmin/virtual-server/help/bandwidth_bw_enable.html
+lib/webmin/virtual-server/help/bandwidth_bw_notify.html
+lib/webmin/virtual-server/help/bandwidth_bw_owner.html
+lib/webmin/virtual-server/help/bandwidth_bw_past.html
+lib/webmin/virtual-server/help/bandwidth_bw_template.html
+lib/webmin/virtual-server/help/bandwidth_bw_warn.html
+lib/webmin/virtual-server/help/bandwidth_ftplog_def.html
+lib/webmin/virtual-server/help/bandwidth_ftplog_rotated.html
+lib/webmin/virtual-server/help/bandwidth_maillog_def.html
+lib/webmin/virtual-server/help/bandwidth_maillog_rotated.html
+lib/webmin/virtual-server/help/bandwidth_mailout.html
+lib/webmin/virtual-server/help/bandwidth_maxdays.html
+lib/webmin/virtual-server/help/bandwidth_serversmode.html
+lib/webmin/virtual-server/help/bandwidth_warnbw_template.html
 lib/webmin/virtual-server/help/bwlimit.html
+lib/webmin/virtual-server/help/cmass.html
+lib/webmin/virtual-server/help/config_alias_post_command.html
+lib/webmin/virtual-server/help/config_alias_pre_command.html
+lib/webmin/virtual-server/help/config_alias_types.html
+lib/webmin/virtual-server/help/config_all_namevirtual.html
+lib/webmin/virtual-server/help/config_allow_subdoms.html
+lib/webmin/virtual-server/help/config_allow_upper.html
+lib/webmin/virtual-server/help/config_api_helper.html
+lib/webmin/virtual-server/help/config_append.html
+lib/webmin/virtual-server/help/config_avail_at.html
+lib/webmin/virtual-server/help/config_avail_change-user.html
+lib/webmin/virtual-server/help/config_avail_cron.html
+lib/webmin/virtual-server/help/config_avail_custom.html
+lib/webmin/virtual-server/help/config_avail_dns.html
+lib/webmin/virtual-server/help/config_avail_file.html
+lib/webmin/virtual-server/help/config_avail_htaccess-htpasswd.html
+lib/webmin/virtual-server/help/config_avail_mail.html
+lib/webmin/virtual-server/help/config_avail_mailboxes.html
+lib/webmin/virtual-server/help/config_avail_mysql.html
+lib/webmin/virtual-server/help/config_avail_passwd.html
+lib/webmin/virtual-server/help/config_avail_phpini.html
+lib/webmin/virtual-server/help/config_avail_postgres.html
+lib/webmin/virtual-server/help/config_avail_proc.html
+lib/webmin/virtual-server/help/config_avail_shell.html
+lib/webmin/virtual-server/help/config_avail_spam.html
+lib/webmin/virtual-server/help/config_avail_syslog.html
+lib/webmin/virtual-server/help/config_avail_telnet.html
+lib/webmin/virtual-server/help/config_avail_updown.html
+lib/webmin/virtual-server/help/config_avail_web.html
+lib/webmin/virtual-server/help/config_avail_webalizer.html
+lib/webmin/virtual-server/help/config_avail_webminlog.html
+lib/webmin/virtual-server/help/config_batch_create.html
+lib/webmin/virtual-server/help/config_bccs.html
+lib/webmin/virtual-server/help/config_bw_template.html
+lib/webmin/virtual-server/help/config_ca_tmpl.html
+lib/webmin/virtual-server/help/config_cert_tmpl.html
+lib/webmin/virtual-server/help/config_check_apache.html
+lib/webmin/virtual-server/help/config_clam_delivery.html
+lib/webmin/virtual-server/help/config_collect_interval.html
+lib/webmin/virtual-server/help/config_compression.html
+lib/webmin/virtual-server/help/config_default_procmail.html
+lib/webmin/virtual-server/help/config_defip.html
+lib/webmin/virtual-server/help/config_defnodbname.html
+lib/webmin/virtual-server/help/config_delete_indom.html
+lib/webmin/virtual-server/help/config_delete_virts.html
+lib/webmin/virtual-server/help/config_denied_domains.html
+lib/webmin/virtual-server/help/config_dir.html
+lib/webmin/virtual-server/help/config_disable.html
+lib/webmin/virtual-server/help/config_display_max.html
+lib/webmin/virtual-server/help/config_dns.html
+lib/webmin/virtual-server/help/config_dns_check.html
+lib/webmin/virtual-server/help/config_dns_ip.html
+lib/webmin/virtual-server/help/config_domains_group.html
+lib/webmin/virtual-server/help/config_domains_sort.html
+lib/webmin/virtual-server/help/config_edit_afiles.html
+lib/webmin/virtual-server/help/config_edit_ftp.html
+lib/webmin/virtual-server/help/config_edit_homes.html
+lib/webmin/virtual-server/help/config_edit_quota.html
+lib/webmin/virtual-server/help/config_fcgid_max.html
+lib/webmin/virtual-server/help/config_from_addr.html
+lib/webmin/virtual-server/help/config_from_reseller.html
+lib/webmin/virtual-server/help/config_ftp.html
+lib/webmin/virtual-server/help/config_ftp_shell.html
+lib/webmin/virtual-server/help/config_generics.html
+lib/webmin/virtual-server/help/config_groupsame.html
+lib/webmin/virtual-server/help/config_home_base.html
+lib/webmin/virtual-server/help/config_home_format.html
+lib/webmin/virtual-server/help/config_homes_dir.html
+lib/webmin/virtual-server/help/config_iface.html
+lib/webmin/virtual-server/help/config_iface_base.html
+lib/webmin/virtual-server/help/config_iface_manual.html
+lib/webmin/virtual-server/help/config_jail_shell.html
+lib/webmin/virtual-server/help/config_key_size.html
+lib/webmin/virtual-server/help/config_key_tmpl.html
+lib/webmin/virtual-server/help/config_ldap.html
+lib/webmin/virtual-server/help/config_ldap_aclasses.html
+lib/webmin/virtual-server/help/config_ldap_base.html
+lib/webmin/virtual-server/help/config_ldap_classes.html
+lib/webmin/virtual-server/help/config_ldap_host.html
+lib/webmin/virtual-server/help/config_ldap_login.html
+lib/webmin/virtual-server/help/config_ldap_mail.html
+lib/webmin/virtual-server/help/config_ldap_mailstore.html
+lib/webmin/virtual-server/help/config_ldap_pass.html
+lib/webmin/virtual-server/help/config_ldap_port.html
+lib/webmin/virtual-server/help/config_ldap_props.html
+lib/webmin/virtual-server/help/config_ldap_unix.html
+lib/webmin/virtual-server/help/config_leave_acl.html
+lib/webmin/virtual-server/help/config_limitnoalias.html
+lib/webmin/virtual-server/help/config_local_template.html
+lib/webmin/virtual-server/help/config_localgroup.html
+lib/webmin/virtual-server/help/config_logrotate.html
+lib/webmin/virtual-server/help/config_longname.html
+lib/webmin/virtual-server/help/config_mail.html
+lib/webmin/virtual-server/help/config_mail_skel.html
+lib/webmin/virtual-server/help/config_mail_system.html
+lib/webmin/virtual-server/help/config_maillog_period.html
+lib/webmin/virtual-server/help/config_mem_cmd.html
+lib/webmin/virtual-server/help/config_mysql.html
+lib/webmin/virtual-server/help/config_mysql_replicas.html
+lib/webmin/virtual-server/help/config_name_max.html
+lib/webmin/virtual-server/help/config_nodeniedssh.html
+lib/webmin/virtual-server/help/config_other_doms.html
+lib/webmin/virtual-server/help/config_other_users.html
+lib/webmin/virtual-server/help/config_passwd_length.html
+lib/webmin/virtual-server/help/config_passwd_mode.html
+lib/webmin/virtual-server/help/config_php_ini.html
+lib/webmin/virtual-server/help/config_post_check.html
+lib/webmin/virtual-server/help/config_post_command.html
+lib/webmin/virtual-server/help/config_postgres.html
+lib/webmin/virtual-server/help/config_pre_command.html
+lib/webmin/virtual-server/help/config_preload_mode.html
+lib/webmin/virtual-server/help/config_proxy_pass.html
 lib/webmin/virtual-server/help/config_quota_commands.html
+lib/webmin/virtual-server/help/config_quota_get_group_command.html
+lib/webmin/virtual-server/help/config_quota_get_user_command.html
 lib/webmin/virtual-server/help/config_quota_list_groups_command.html
 lib/webmin/virtual-server/help/config_quota_list_users_command.html
 lib/webmin/virtual-server/help/config_quota_set_group_command.html
 lib/webmin/virtual-server/help/config_quota_set_user_command.html
 lib/webmin/virtual-server/help/config_quotas.html
+lib/webmin/virtual-server/help/config_reseller_modules.html
+lib/webmin/virtual-server/help/config_reseller_theme.html
+lib/webmin/virtual-server/help/config_shell.html
+lib/webmin/virtual-server/help/config_show_features.html
+lib/webmin/virtual-server/help/config_show_mailsize.html
+lib/webmin/virtual-server/help/config_show_nf.html
+lib/webmin/virtual-server/help/config_show_pass.html
+lib/webmin/virtual-server/help/config_show_quotas.html
+lib/webmin/virtual-server/help/config_show_sysinfo.html
+lib/webmin/virtual-server/help/config_show_tabs.html
+lib/webmin/virtual-server/help/config_show_ugroup.html
+lib/webmin/virtual-server/help/config_spam.html
+lib/webmin/virtual-server/help/config_spam_delivery.html
+lib/webmin/virtual-server/help/config_spam_level.html
+lib/webmin/virtual-server/help/config_spam_white.html
+lib/webmin/virtual-server/help/config_ssl.html
+lib/webmin/virtual-server/help/config_status.html
+lib/webmin/virtual-server/help/config_template_auto.html
+lib/webmin/virtual-server/help/config_theme_image.html
+lib/webmin/virtual-server/help/config_theme_link.html
+lib/webmin/virtual-server/help/config_unix.html
+lib/webmin/virtual-server/help/config_unix_shell.html
+lib/webmin/virtual-server/help/config_update_template.html
+lib/webmin/virtual-server/help/config_user_template.html
+lib/webmin/virtual-server/help/config_virus.html
+lib/webmin/virtual-server/help/config_vpopmail_auto.html
+lib/webmin/virtual-server/help/config_vpopmail_dir.html
+lib/webmin/virtual-server/help/config_vpopmail_group.html
+lib/webmin/virtual-server/help/config_vpopmail_user.html
+lib/webmin/virtual-server/help/config_warnbw_template.html
+lib/webmin/virtual-server/help/config_web.html
+lib/webmin/virtual-server/help/config_webalizer.html
+lib/webmin/virtual-server/help/config_webalizer_nocron.html
+lib/webmin/virtual-server/help/config_webmin.html
+lib/webmin/virtual-server/help/config_webmin_modules.html
+lib/webmin/virtual-server/help/config_webmin_theme.html
+lib/webmin/virtual-server/help/create_alias.html
+lib/webmin/virtual-server/help/create_form.html
+lib/webmin/virtual-server/help/create_subdom.html
+lib/webmin/virtual-server/help/create_subserver.html
 lib/webmin/virtual-server/help/createmailbox.de.html
 lib/webmin/virtual-server/help/createmailbox.html
+lib/webmin/virtual-server/help/custom_fields.html
+lib/webmin/virtual-server/help/custom_links.html
+lib/webmin/virtual-server/help/databases.html
 lib/webmin/virtual-server/help/dbname.html
+lib/webmin/virtual-server/help/dbslimit.html
 lib/webmin/virtual-server/help/dir.html
+lib/webmin/virtual-server/help/disabled_url.html
+lib/webmin/virtual-server/help/disabled_web.html
 lib/webmin/virtual-server/help/diskquota.de.html
 lib/webmin/virtual-server/help/diskquota.html
 lib/webmin/virtual-server/help/dns.de.html
 lib/webmin/virtual-server/help/dns.html
+lib/webmin/virtual-server/help/dns_ip.html
 lib/webmin/virtual-server/help/domainname.de.html
 lib/webmin/virtual-server/help/domainname.html
+lib/webmin/virtual-server/help/domains_group.html
 lib/webmin/virtual-server/help/domslimit.html
 lib/webmin/virtual-server/help/dynip.html
+lib/webmin/virtual-server/help/edit_link.html
 lib/webmin/virtual-server/help/extraemail.html
+lib/webmin/virtual-server/help/features.html
 lib/webmin/virtual-server/help/framefwd.html
 lib/webmin/virtual-server/help/ftp.html
 lib/webmin/virtual-server/help/fwdto.html
@@ -139,6 +363,22 @@ lib/webmin/virtual-server/help/index.de.html
 lib/webmin/virtual-server/help/index.html
 lib/webmin/virtual-server/help/ipaddress.de.html
 lib/webmin/virtual-server/help/ipaddress.html
+lib/webmin/virtual-server/help/limits.html
+lib/webmin/virtual-server/help/limits_alias.html
+lib/webmin/virtual-server/help/limits_aliasdoms.html
+lib/webmin/virtual-server/help/limits_dbs.html
+lib/webmin/virtual-server/help/limits_demo.html
+lib/webmin/virtual-server/help/limits_doms.html
+lib/webmin/virtual-server/help/limits_edit.html
+lib/webmin/virtual-server/help/limits_features.html
+lib/webmin/virtual-server/help/limits_forceunder.html
+lib/webmin/virtual-server/help/limits_mailbox.html
+lib/webmin/virtual-server/help/limits_modules.html
+lib/webmin/virtual-server/help/limits_mongrels.html
+lib/webmin/virtual-server/help/limits_nodbname.html
+lib/webmin/virtual-server/help/limits_norename.html
+lib/webmin/virtual-server/help/limits_realdoms.html
+lib/webmin/virtual-server/help/limits_shell.html
 lib/webmin/virtual-server/help/logrotate.html
 lib/webmin/virtual-server/help/mail.de.html
 lib/webmin/virtual-server/help/mail.html
@@ -147,17 +387,39 @@ lib/webmin/virtual-server/help/mailboxlimit.html
 lib/webmin/virtual-server/help/mailfile.de.html
 lib/webmin/virtual-server/help/mailfile.html
 lib/webmin/virtual-server/help/mailgroupname.html
+lib/webmin/virtual-server/help/maillog.html
+lib/webmin/virtual-server/help/mailopts.html
+lib/webmin/virtual-server/help/massdomains.html
+lib/webmin/virtual-server/help/matchall.html
+lib/webmin/virtual-server/help/move.html
 lib/webmin/virtual-server/help/mysql.de.html
 lib/webmin/virtual-server/help/mysql.fr.html
 lib/webmin/virtual-server/help/mysql.html
+lib/webmin/virtual-server/help/namedconf.html
 lib/webmin/virtual-server/help/newchroot.html
+lib/webmin/virtual-server/help/newglobal.html
+lib/webmin/virtual-server/help/newips.html
+lib/webmin/virtual-server/help/newips_new.html
+lib/webmin/virtual-server/help/newips_old.html
+lib/webmin/virtual-server/help/newips_servers_def.html
 lib/webmin/virtual-server/help/newmail.html
+lib/webmin/virtual-server/help/newmxs.html
+lib/webmin/virtual-server/help/newquotas.html
+lib/webmin/virtual-server/help/newshells.html
+lib/webmin/virtual-server/help/nodbname.html
+lib/webmin/virtual-server/help/nospam.html
 lib/webmin/virtual-server/help/ownersemail.html
 lib/webmin/virtual-server/help/ownersname.de.html
 lib/webmin/virtual-server/help/ownersname.html
 lib/webmin/virtual-server/help/parentdom.html
 lib/webmin/virtual-server/help/password.de.html
 lib/webmin/virtual-server/help/password.html
+lib/webmin/virtual-server/help/phpmode.html
+lib/webmin/virtual-server/help/phpmode_children.html
+lib/webmin/virtual-server/help/phpmode_suexec.html
+lib/webmin/virtual-server/help/phpver.html
+lib/webmin/virtual-server/help/plugin_mod_config.html
+lib/webmin/virtual-server/help/plugin_mods.html
 lib/webmin/virtual-server/help/postgres.de.html
 lib/webmin/virtual-server/help/postgres.html
 lib/webmin/virtual-server/help/prefixname.html
@@ -166,19 +428,169 @@ lib/webmin/virtual-server/help/qmailfiles.html
 lib/webmin/virtual-server/help/qmailquota.html
 lib/webmin/virtual-server/help/realname.de.html
 lib/webmin/virtual-server/help/realname.html
+lib/webmin/virtual-server/help/remail.html
+lib/webmin/virtual-server/help/rename.html
+lib/webmin/virtual-server/help/res.html
+lib/webmin/virtual-server/help/reseller.html
+lib/webmin/virtual-server/help/reseller_backups.html
+lib/webmin/virtual-server/help/reseller_defip.html
+lib/webmin/virtual-server/help/reseller_demo.html
+lib/webmin/virtual-server/help/reseller_desc.html
+lib/webmin/virtual-server/help/reseller_doms.html
+lib/webmin/virtual-server/help/reseller_email.html
+lib/webmin/virtual-server/help/reseller_features.html
+lib/webmin/virtual-server/help/reseller_hide.html
+lib/webmin/virtual-server/help/reseller_link.html
+lib/webmin/virtual-server/help/reseller_lock.html
+lib/webmin/virtual-server/help/reseller_logo.html
+lib/webmin/virtual-server/help/reseller_max_bw.html
+lib/webmin/virtual-server/help/reseller_max_dbs.html
+lib/webmin/virtual-server/help/reseller_max_doms.html
+lib/webmin/virtual-server/help/reseller_max_mailboxes.html
+lib/webmin/virtual-server/help/reseller_max_quota.html
+lib/webmin/virtual-server/help/reseller_name.html
+lib/webmin/virtual-server/help/reseller_pass.html
+lib/webmin/virtual-server/help/reseller_ranges.html
+lib/webmin/virtual-server/help/reseller_subdom.html
+lib/webmin/virtual-server/help/restore_fix.html
+lib/webmin/virtual-server/help/restore_newip.html
+lib/webmin/virtual-server/help/restore_only.html
+lib/webmin/virtual-server/help/restore_reuid.html
+lib/webmin/virtual-server/help/rubymode.html
+lib/webmin/virtual-server/help/sched.html
+lib/webmin/virtual-server/help/scripts.html
+lib/webmin/virtual-server/help/sharedips.html
 lib/webmin/virtual-server/help/spam.html
+lib/webmin/virtual-server/help/spam_clear.html
+lib/webmin/virtual-server/help/spam_client.html
+lib/webmin/virtual-server/help/spam_level.html
+lib/webmin/virtual-server/help/spam_scanner.html
+lib/webmin/virtual-server/help/spam_spam.html
+lib/webmin/virtual-server/help/spam_virus.html
+lib/webmin/virtual-server/help/spam_white.html
 lib/webmin/virtual-server/help/spf.html
 lib/webmin/virtual-server/help/spf_a.html
 lib/webmin/virtual-server/help/spf_all.html
 lib/webmin/virtual-server/help/spf_enabled.html
+lib/webmin/virtual-server/help/spf_include.html
 lib/webmin/virtual-server/help/spf_ip4.html
 lib/webmin/virtual-server/help/spf_mx.html
 lib/webmin/virtual-server/help/ssl.html
+lib/webmin/virtual-server/help/status.html
 lib/webmin/virtual-server/help/subs.html
 lib/webmin/virtual-server/help/subs2.html
 lib/webmin/virtual-server/help/template.html
+lib/webmin/virtual-server/help/template_admin.html
+lib/webmin/virtual-server/help/template_admindom.html
+lib/webmin/virtual-server/help/template_alias_mode.html
+lib/webmin/virtual-server/help/template_aliascopy.html
+lib/webmin/virtual-server/help/template_aliasdomslimit.html
+lib/webmin/virtual-server/help/template_aliases_mode.html
+lib/webmin/virtual-server/help/template_aliaslimit.html
+lib/webmin/virtual-server/help/template_append.html
+lib/webmin/virtual-server/help/template_bccto.html
+lib/webmin/virtual-server/help/template_bind_replace.html
+lib/webmin/virtual-server/help/template_bouncealias.html
+lib/webmin/virtual-server/help/template_bwlimit.html
+lib/webmin/virtual-server/help/template_capabilities.html
+lib/webmin/virtual-server/help/template_cc.html
+lib/webmin/virtual-server/help/template_dbgroup.html
+lib/webmin/virtual-server/help/template_dbslimit.html
+lib/webmin/virtual-server/help/template_defmquota.html
+lib/webmin/virtual-server/help/template_dns.html
+lib/webmin/virtual-server/help/template_dns_master.html
+lib/webmin/virtual-server/help/template_dns_ns.html
+lib/webmin/virtual-server/help/template_dns_spf_mode.html
+lib/webmin/virtual-server/help/template_dns_spfall.html
+lib/webmin/virtual-server/help/template_dns_spfhosts.html
+lib/webmin/virtual-server/help/template_dns_sub.html
+lib/webmin/virtual-server/help/template_domalias.html
+lib/webmin/virtual-server/help/template_domalias_type.html
+lib/webmin/virtual-server/help/template_domaliases_mode.html
+lib/webmin/virtual-server/help/template_domslimit.html
+lib/webmin/virtual-server/help/template_extra_prefix.html
+lib/webmin/virtual-server/help/template_featurelimits.html
+lib/webmin/virtual-server/help/template_for.html
+lib/webmin/virtual-server/help/template_for_alias.html
+lib/webmin/virtual-server/help/template_for_parent.html
+lib/webmin/virtual-server/help/template_for_sub.html
+lib/webmin/virtual-server/help/template_for_users.html
+lib/webmin/virtual-server/help/template_frame.html
+lib/webmin/virtual-server/help/template_ftp.html
+lib/webmin/virtual-server/help/template_ftp_dir_def.html
+lib/webmin/virtual-server/help/template_ftpgroup.html
+lib/webmin/virtual-server/help/template_gacl.html
+lib/webmin/virtual-server/help/template_gacl_umode.html
+lib/webmin/virtual-server/help/template_groups.html
+lib/webmin/virtual-server/help/template_html_dir_def.html
+lib/webmin/virtual-server/help/template_html_perms.html
+lib/webmin/virtual-server/help/template_init.html
+lib/webmin/virtual-server/help/template_initsub.html
+lib/webmin/virtual-server/help/template_logrotate.html
+lib/webmin/virtual-server/help/template_mail.html
+lib/webmin/virtual-server/help/template_mailboxlimit.html
+lib/webmin/virtual-server/help/template_mailgroup.html
+lib/webmin/virtual-server/help/template_mongrelslimit.html
+lib/webmin/virtual-server/help/template_mysql.html
+lib/webmin/virtual-server/help/template_mysql_charset.html
+lib/webmin/virtual-server/help/template_mysql_chgrp.html
+lib/webmin/virtual-server/help/template_mysql_hosts.html
+lib/webmin/virtual-server/help/template_mysql_mkdb.html
+lib/webmin/virtual-server/help/template_mysql_nopass.html
+lib/webmin/virtual-server/help/template_mysql_suffix.html
+lib/webmin/virtual-server/help/template_mysql_wild.html
+lib/webmin/virtual-server/help/template_name.html
+lib/webmin/virtual-server/help/template_othergroups.html
+lib/webmin/virtual-server/help/template_php4cgi.html
+lib/webmin/virtual-server/help/template_php4fcgi.html
+lib/webmin/virtual-server/help/template_php5cgi.html
+lib/webmin/virtual-server/help/template_php5fcgi.html
+lib/webmin/virtual-server/help/template_php_ini.html
+lib/webmin/virtual-server/help/template_php_noedit.html
+lib/webmin/virtual-server/help/template_php_vars.html
+lib/webmin/virtual-server/help/template_phpchildren.html
+lib/webmin/virtual-server/help/template_phpmode.html
+lib/webmin/virtual-server/help/template_phpver.html
+lib/webmin/virtual-server/help/template_postgres_encoding.html
+lib/webmin/virtual-server/help/template_quota.html
+lib/webmin/virtual-server/help/template_quotatype.html
+lib/webmin/virtual-server/help/template_ranges_mode.html
+lib/webmin/virtual-server/help/template_realdomslimit.html
+lib/webmin/virtual-server/help/template_resellers.html
+lib/webmin/virtual-server/help/template_root.html
+lib/webmin/virtual-server/help/template_rubymode.html
+lib/webmin/virtual-server/help/template_skel.html
+lib/webmin/virtual-server/help/template_skel_subs.html
+lib/webmin/virtual-server/help/template_spam.html
+lib/webmin/virtual-server/help/template_spam_host.html
+lib/webmin/virtual-server/help/template_spam_size.html
+lib/webmin/virtual-server/help/template_spamclear.html
+lib/webmin/virtual-server/help/template_stats_dir.html
+lib/webmin/virtual-server/help/template_statsedit.html
+lib/webmin/virtual-server/help/template_statspass.html
+lib/webmin/virtual-server/help/template_status.html
+lib/webmin/virtual-server/help/template_statusonly.html
+lib/webmin/virtual-server/help/template_statustimeout.html
+lib/webmin/virtual-server/help/template_statustmpl.html
+lib/webmin/virtual-server/help/template_subject.html
+lib/webmin/virtual-server/help/template_suexec.html
+lib/webmin/virtual-server/help/template_ugroup_mode.html
+lib/webmin/virtual-server/help/template_uquota.html
+lib/webmin/virtual-server/help/template_user_def.html
+lib/webmin/virtual-server/help/template_ushell.html
+lib/webmin/virtual-server/help/template_web.html
+lib/webmin/virtual-server/help/template_web_port.html
+lib/webmin/virtual-server/help/template_web_sslport.html
+lib/webmin/virtual-server/help/template_web_usermin_ssl.html
+lib/webmin/virtual-server/help/template_web_webmin_ssl.html
+lib/webmin/virtual-server/help/template_webalizer.html
+lib/webmin/virtual-server/help/template_webmail.html
+lib/webmin/virtual-server/help/template_webmaildom.html
+lib/webmin/virtual-server/help/template_writelogs.html
 lib/webmin/virtual-server/help/tmpls.html
+lib/webmin/virtual-server/help/tscripts.html
 lib/webmin/virtual-server/help/uftp.html
+lib/webmin/virtual-server/help/umass.html
 lib/webmin/virtual-server/help/unix.html
 lib/webmin/virtual-server/help/unixgroupname.de.html
 lib/webmin/virtual-server/help/unixgroupname.html
@@ -186,10 +598,19 @@ lib/webmin/virtual-server/help/unixusername.de.html
 lib/webmin/virtual-server/help/unixusername.html
 lib/webmin/virtual-server/help/unixuserquota.de.html
 lib/webmin/virtual-server/help/unixuserquota.html
+lib/webmin/virtual-server/help/usage.html
+lib/webmin/virtual-server/help/user_auto.html
+lib/webmin/virtual-server/help/user_forward.html
+lib/webmin/virtual-server/help/user_period.html
+lib/webmin/virtual-server/help/user_tome.html
 lib/webmin/virtual-server/help/userdest.html
+lib/webmin/virtual-server/help/usergroups.html
 lib/webmin/virtual-server/help/userhome.html
+lib/webmin/virtual-server/help/userhomeftp.html
 lib/webmin/virtual-server/help/usermailbox.html
 lib/webmin/virtual-server/help/username.html
+lib/webmin/virtual-server/help/username2.html
+lib/webmin/virtual-server/help/ushell.html
 lib/webmin/virtual-server/help/virtualinterface.de.html
 lib/webmin/virtual-server/help/virtualinterface.html
 lib/webmin/virtual-server/help/virus.html
@@ -222,7 +643,7 @@ lib/webmin/virtual-server/images/newfeatures.gif
 lib/webmin/virtual-server/images/newfields.gif
 lib/webmin/virtual-server/images/newframe.gif
 lib/webmin/virtual-server/images/newftp.gif
-lib/webmin/virtual-server/images/newglobal.cgi
+lib/webmin/virtual-server/images/newglobal.gif
 lib/webmin/virtual-server/images/newips.gif
 lib/webmin/virtual-server/images/newlinks.gif
 lib/webmin/virtual-server/images/newlocal.gif
@@ -277,6 +698,7 @@ lib/webmin/virtual-server/lang/zh_CN
 lib/webmin/virtual-server/lang/zh_CN.UTF-8
 lib/webmin/virtual-server/lang/zh_TW.Big5
 lib/webmin/virtual-server/lang/zh_TW.UTF-8
+lib/webmin/virtual-server/list-commands.pl
 lib/webmin/virtual-server/list-features.pl
 lib/webmin/virtual-server/list_admins.cgi
 lib/webmin/virtual-server/list_aliases.cgi
@@ -330,6 +752,10 @@ lib/webmin/virtual-server/newfeatures-all/3.59/4-purgeftp
 lib/webmin/virtual-server/newfeatures-all/3.60/1-spf
 lib/webmin/virtual-server/newfeatures-all/3.60/3-webmail
 lib/webmin/virtual-server/newfeatures-all/3.60/4-globals
+lib/webmin/virtual-server/newfeatures-all/3.61/1-apihelp
+lib/webmin/virtual-server/newfeatures-all/3.61/2-adminemail
+lib/webmin/virtual-server/newfeatures-all/3.61/5-matchall
+lib/webmin/virtual-server/newfeatures-all/3.61/6-encodings
 lib/webmin/virtual-server/newfeatures-gpl/3.52/8-webowner
 lib/webmin/virtual-server/newfeatures-gpl/3.55/8-move
 lib/webmin/virtual-server/newfeatures-gpl/3.55/9-preload
@@ -337,10 +763,9 @@ lib/webmin/virtual-server/newfeatures-gpl/3.56/1-customfields
 lib/webmin/virtual-server/newfeatures-gpl/3.58/10-spamvirus
 lib/webmin/virtual-server/newfeatures-gpl/3.60/2-logo
 lib/webmin/virtual-server/newfeatures-lib.pl
-lib/webmin/virtual-server/check-config.pl
-lib/webmin/virtual-server/edit_newglobal.cgi
 lib/webmin/virtual-server/newip_form.cgi
 lib/webmin/virtual-server/newkey.cgi
+lib/webmin/virtual-server/postgres-encodings
 lib/webmin/virtual-server/postinstall.pl
 lib/webmin/virtual-server/postsave.cgi
 lib/webmin/virtual-server/procmail-logger.pl
@@ -412,6 +837,7 @@ lib/webmin/virtual-server/virtual_feature_api.pl
 lib/webmin/virtual-server/vui-lib.pl
 lib/webmin/virtual-server/warnbw-template
 lib/webmin/virtual-server/writelogs.pl
+@dirrm lib/webmin/virtual-server/newfeatures-gpl/3.61
 @dirrm lib/webmin/virtual-server/newfeatures-gpl/3.60
 @dirrm lib/webmin/virtual-server/newfeatures-gpl/3.59
 @dirrm lib/webmin/virtual-server/newfeatures-gpl/3.58
@@ -422,6 +848,7 @@ lib/webmin/virtual-server/writelogs.pl
 @dirrm lib/webmin/virtual-server/newfeatures-gpl/3.53
 @dirrm lib/webmin/virtual-server/newfeatures-gpl/3.52
 @dirrm lib/webmin/virtual-server/newfeatures-gpl
+@dirrm lib/webmin/virtual-server/newfeatures-all/3.61
 @dirrm lib/webmin/virtual-server/newfeatures-all/3.60
 @dirrm lib/webmin/virtual-server/newfeatures-all/3.59
 @dirrm lib/webmin/virtual-server/newfeatures-all/3.58
@@ -437,7 +864,6 @@ lib/webmin/virtual-server/writelogs.pl
 @dirrm lib/webmin/virtual-server/help
 @dirrm lib/webmin/virtual-server/IDNA
 @dirrm lib/webmin/virtual-server
-@dirrmtry lib/webmin
-@exec [ -e %D/etc/webmin/virtual-server ] || mkdir %D/etc/webmin/virtual-server
 @dirrmtry etc/webmin/virtual-server
 @dirrmtry etc/webmin
+@exec [ -e %D/etc/webmin/virtual-server ] || mkdir %D/etc/webmin/virtual-server