diff --git a/net/pfSense-pkg-Avahi/Makefile b/net/pfSense-pkg-Avahi/Makefile
index 2ed85453ea2c..e8f1a05dfc2d 100644
--- a/net/pfSense-pkg-Avahi/Makefile
+++ b/net/pfSense-pkg-Avahi/Makefile
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-pkg-Avahi
-PORTVERSION=	1.13
+PORTVERSION=	2.0.0
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty
-EXTRACT_ONLY=	# empty
 
 MAINTAINER=	coreteam@pfsense.org
 COMMENT=	pfSense package Avahi
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libavahi-core.so:net/avahi-app
+RUN_DEPENDS=	avahi-app>=0:net/avahi-app
 
 NO_BUILD=	yes
 NO_MTREE=	yes
@@ -24,22 +23,21 @@ do-extract:
 	${MKDIR} ${WRKSRC}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/pkg
+	${MKDIR} ${STAGEDIR}${PREFIX}/pkg/avahi
 	${MKDIR} ${STAGEDIR}/etc/inc/priv
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/avahi
+	${MKDIR} ${STAGEDIR}${PREFIX}/www
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} -m 0644 ${FILESDIR}${PREFIX}/pkg/avahi.xml \
-		${STAGEDIR}${PREFIX}/pkg
-	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/avahi.inc \
+	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/avahi.xml \
 		${STAGEDIR}${PREFIX}/pkg
+	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/avahi/avahi.inc \
+		${STAGEDIR}${PREFIX}/pkg/avahi
 	${INSTALL_DATA} ${FILESDIR}/etc/inc/priv/avahi.priv.inc \
 		${STAGEDIR}/etc/inc/priv
-	${INSTALL_DATA} ${FILESDIR}${PREFIX}/etc/avahi/ssh.service \
-		${STAGEDIR}${PREFIX}/etc/avahi
-	${INSTALL_DATA} ${FILESDIR}${PREFIX}/etc/avahi/sftp-ssh.service \
-		${STAGEDIR}${PREFIX}/etc/avahi
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/avahi_settings.php \
+		${STAGEDIR}${PREFIX}/www
+
 	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
 		${STAGEDIR}${DATADIR}/info.xml
 
diff --git a/net/pfSense-pkg-Avahi/files/etc/inc/priv/avahi.priv.inc b/net/pfSense-pkg-Avahi/files/etc/inc/priv/avahi.priv.inc
index 09b7eca81f58..1cd6e3b3ab20 100644
--- a/net/pfSense-pkg-Avahi/files/etc/inc/priv/avahi.priv.inc
+++ b/net/pfSense-pkg-Avahi/files/etc/inc/priv/avahi.priv.inc
@@ -3,7 +3,7 @@
  * avahi.priv.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2015 Rubicon Communications, LLC (Netgate)
+ * Copyright (c) 2018 Denny Page
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,10 +22,10 @@
 global $priv_list;
 
 $priv_list['page-services-avahi'] = array();
-$priv_list['page-services-avahi']['name'] = "WebCfg - Services: Avahi package";
-$priv_list['page-services-avahi']['descr'] = "Allow access to Avahi package GUI";
+$priv_list['page-services-avahi']['name'] = "WebCfg - Services: Avahi";
+$priv_list['page-services-avahi']['descr'] = "Access the Avahi package gui";
 
 $priv_list['page-services-avahi']['match'] = array();
-$priv_list['page-services-avahi']['match'][] = "pkg_edit.php?xml=avahi.xml*";
+$priv_list['page-services-avahi']['match'][] = "avahi_settings.php*";
 
 ?>
diff --git a/net/pfSense-pkg-Avahi/files/usr/local/etc/avahi/sftp-ssh.service b/net/pfSense-pkg-Avahi/files/usr/local/etc/avahi/sftp-ssh.service
deleted file mode 100644
index c65535a84599..000000000000
--- a/net/pfSense-pkg-Avahi/files/usr/local/etc/avahi/sftp-ssh.service
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-
-<!-- $Id$ -->
-
-<!--
-  This file is part of avahi.
- 
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<!-- See avahi.service(5) for more information about this configuration file -->
-
-<service-group>
-
-  <name replace-wildcards="yes">SFTP File Transfer on %h</name>
-
-  <service>
-    <type>_sftp-ssh._tcp</type>
-    <port>22</port>
-  </service>
-
-</service-group>
diff --git a/net/pfSense-pkg-Avahi/files/usr/local/etc/avahi/ssh.service b/net/pfSense-pkg-Avahi/files/usr/local/etc/avahi/ssh.service
deleted file mode 100644
index a493444e169d..000000000000
--- a/net/pfSense-pkg-Avahi/files/usr/local/etc/avahi/ssh.service
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-
-<!-- $Id$ -->
-
-<!--
-  This file is part of avahi.
- 
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<!-- See avahi.service(5) for more information about this configuration file -->
-
-<service-group>
-
-  <name replace-wildcards="yes">%h</name>
-
-  <service>
-    <type>_ssh._tcp</type>
-    <port>22</port>
-  </service>
-
-</service-group>
diff --git a/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi.inc b/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi.inc
deleted file mode 100644
index 9703f976e994..000000000000
--- a/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi.inc
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-/*
- * avahi.inc
- *
- * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2009-2015 Rubicon Communications, LLC (Netgate)
- * All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-require_once('config.inc');
-require_once('interfaces.inc');
-require_once('service-utils.inc');
-require_once('util.inc');
- 
-define('AVAHI_BASE', '/usr/local');
-
-function avahi_write_config() {
-	global $config;
-
-	// Pull some various values out of config.xml
-	if (isset($config['installedpackages']['avahi']['config'][0])) {
-		$avahi_config = $config['installedpackages']['avahi']['config'][0];
-	} else {
-		$avahi_config = array();
-	}
-	// Server Options
-	$hostname = $config['system']['hostname'];
-	$domain = $config['system']['domain'];
-	$enable = $avahi_config['enable'];
-	$browsedomains = $avahi_config['browsedomains'] ?: "local";
-	$denyif = $avahi_config['denyinterfaces'];
-	$useipv4 = ($avahi_config['enable_ipv4']) ? "yes" : "no";
-	$useipv6 = ($avahi_config['enable_ipv6']) ? "yes" : "no";
-	$usedbus = ($avahi_config['disable_dbus']) ? "no" : "yes";
-
-	if (is_numeric($avahi_config['cache_max'])) {
-		$cachemax = "cache-entries-max={$avahi_config['cache_max']}";
-	}
-
-	// Wide Area
-	$widearea = ($avahi_config['enable_wide_area']) ? "yes" : "no";
-	// Publishing Options
-	$publish = ($avahi_config['disable_publishing']) ? "yes" : "no";
-	$userpublish = ($avahi_config['disable_user_service_publishing']) ? "yes" : "no";
-	$addresspublish = ($avahi_config['publish_addresses']) ? "yes" : "no";
-	$cookie = ($avahi_config['add_service_cookie']) ? "yes" : "no";
-	$hinfopublish = ($avahi_config['publish_hinfo']) ? "yes" : "no";
-	$wspublish = ($avahi_config['publish_workstation']) ? "yes" : "no";
-	$aaaaonv4 = ($avahi_config['publish_aaaa_on_ipv4']) ? "yes" : "no";
-	$aonv6 = ($avahi_config['publish_a_on_ipv6']) ? "yes" : "no";
-	// Reflector Options
-	$reflect = ($avahi_config['enable_reflector']) ? "yes" : "no";
-	$reflectipv = ($avahi_config['reflect_ipv']) ? "yes" : "no";
-
-	// Never pass along WAN. Bad.
-	$denyinterfaces = $config['interfaces']['wan']['if'];
-
-	// Process interfaces defined by user to deny.
-	if ($denyif) {
-		$if = explode(",", $denyif);
-		foreach ($if as $i) {
-			$ifreal = convert_friendly_interface_to_real_interface_name($i);
-			if ($ifreal) {
-				$denyinterfaces .= ", " . $ifreal;
-			}
-		}
-	}
-
-	// Process DNS servers and omit localhost if present in /etc/resolv.conf
-	$publishdns = '';
-	$dns = implode(" ", get_dns_servers());
-	$dns = trim(str_replace('127.0.0.1', '', $dns));
-	$dns = str_replace(' ', ', ', $dns);
-	if ($dns) {
-		$publishdns = "publish-dns-servers={$dns}";
-
-		// but comment out the setting if DNS publishing is disabled
-		if (!$avahi_config['publish_resolv_conf_dns_servers']) {
-			$publishdns = "#" . $publishdns;
-		}
-	}
-
-	// Construct the avahi configuration
-	$avahiconfig = <<<EOF
-
-# avahi.conf - This file was automatically generated by the pfSense pacakge
-# manager. Do not edit this file, it will be overwritten automatically.
-# See /usr/local/pkg/avahi.inc to make changes to this file!
-
-[server]
-host-name={$hostname}
-domain-name=local
-browse-domains={$browsedomains}
-deny-interfaces={$denyinterfaces}
-use-ipv4={$useipv4}
-use-ipv6={$useipv6}
-enable-dbus={$usedbus}
-#check-response-ttl=no
-#use-iff-running=no
-#disallow-other-stacks=no
-allow-point-to-point=yes
-{$cachemax}
-
-[wide-area]
-enable-wide-area={$widearea}
-
-[publish]
-disable-publishing={$publish}
-disable-user-service-publishing={$userpublish}
-add-service-cookie={$cookie}
-publish-addresses={$addresspublish}
-publish-hinfo={$hinfopublish}
-publish-workstation={$wspublish}
-#publish-domain=yes
-{$publishdns}
-#publish-resolv-conf-dns-servers=yes
-publish-aaaa-on-ipv4={$aaaaonv4}
-publish-a-on-ipv6={$aonv6}
-
-[reflector]
-enable-reflector={$reflect}
-reflect-ipv={$reflectipv}
-
-[rlimits]
-rlimit-core=0
-rlimit-data=4194304
-rlimit-fsize=0
-rlimit-nofile=300
-rlimit-stack=4194304
-rlimit-nproc=3
-#rlimit-as=
-
-EOF;
-
-	/* Write out .conf file */
-	safe_mkdir(AVAHI_BASE . "/etc/avahi");
-	$fd = fopen(AVAHI_BASE . "/etc/avahi/avahi-daemon.conf", "w");
-	fwrite($fd, $avahiconfig);
-	fclose($fd);
-
-}
-
-function avahi_write_rcfile() {
-	global $config;
-	if (isset($config['installedpackages']['avahi']['config'][0])) {
-		$avahi_config = $config['installedpackages']['avahi']['config'][0];
-	} else {
-		$avahi_config = array();
-	}
-
-	$start = "/etc/rc.conf_mount_rw\n";
-	$start .= "if [ ! -d /proc/0 ]; then\n";
-	$start .= "	/bin/mkdir -p /proc\n";
-	$start .= "	/sbin/mount -t procfs procfs /proc\n";
-	$start .= "fi\n";
-	$start .= "/usr/bin/killall avahi-daemon >/dev/null 2>&1\n";
-	if (!$avahi_config['disable_dbus']) {
-		$start .= "if [ ! -d /var/run/dbus ]; then\n";
-		$start .= "        /bin/mkdir /var/run/dbus\n";
-		$start .= "        /usr/sbin/chown messagebus:messagebus /var/run/dbus\n";
-		$start .= "fi\n";
-		if (file_exists(AVAHI_BASE . "/etc/rc.d/dbus")) {
-			$start .= AVAHI_BASE . "/etc/rc.d/dbus onestop\n";
-			$start .= "/bin/rm /var/run/dbus/dbus.pid >/dev/null 2>&1\n";
-			$start .= AVAHI_BASE . "/etc/rc.d/dbus onestart\n";
-			$start .= "sleep 5\n";
-		}
-	}
-	$start .= AVAHI_BASE . "/sbin/avahi-daemon -D\n";
-	$start .= "/etc/rc.conf_mount_ro\n";
-
-	$stop = "/usr/bin/killall avahi-daemon >/dev/null 2>&1\n";
-	if (!$avahi_config['disable_dbus']) {
-		if (file_exists(AVAHI_BASE . "/etc/rc.d/dbus")) {
-			$stop .= AVAHI_BASE . "/etc/rc.d/dbus onestop\n";
-			$stop .= "/bin/rm /var/run/dbus/dbus.pid >/dev/null 2>&1\n";
-		}
-	}
-
-	write_rcfile(array(
-		"file" => "avahi-daemon.sh",
-		"start" => $start,
-		"stop" => $stop
-		)
-	);
-}
-
-function avahi_sync() {
-	global $config;
-	conf_mount_rw();
-
-	if (is_service_running("avahi")) {
-		stop_service("avahi");
-	}
-	avahi_write_config();
-
-	// Is package enabled?
-	if ($config['installedpackages']['avahi']['config'][0]['enable']) {
-		avahi_write_rcfile();
-		if (file_exists("/usr/local/etc/rc.d/dbus")) {
-			if (!$config['installedpackages']['avahi']['config'][0]['disable_dbus']) {
-				chmod("/usr/local/etc/rc.d/dbus", 0755);
-			}
-		}
-		start_service("avahi");
-	} else {
-		unlink_if_exists("/usr/local/etc/rc.d/avahi-daemon.sh");
-		if (file_exists("/usr/local/etc/rc.d/dbus")) {
-			chmod("/usr/local/etc/rc.d/dbus", 0644);
-		}
-	}
-
-	conf_mount_ro();
-}
-
-function avahi_upgrade_config() {
-	global $config;
-
-	$avahi_config =& $config['installedpackages']['avahi']['config'][0];
-	if (!is_array($avahi_config)) {
-		$avahi_config = array();
-	}
-	$changes = 0;
-	// Convert previous disable values to enable ones
-	// If broken settings were configured due to lack of validation, just set to defaults
-	if (isset($avahi_config['disable_ipv4']) && isset($avahi_config['disable_ipv6']) && $avahi_config['disable_ipv4'] == "on" && $avahi_config['disable_ipv6'] == "on") {
-		$avahi_config['enable_ipv4'] = "on";
-		$avahi_config['enable_ipv6'] = "on";
-		unset($avahi_config['disable_ipv4']);
-		unset($avahi_config['disable_ipv6']);
-		$changes++;
-	} elseif (isset($avahi_config['disable_ipv4']) && $avahi_config['disable_ipv4'] != "on") {
-		$avahi_config['enable_ipv4'] = "on";
-		unset($avahi_config['disable_ipv4']);
-		$changes++;
-	} elseif (isset($avahi_config['disable_ipv6']) && $avahi_config['disable_ipv6'] != "on") {
-		$avahi_config['enable_ipv6'] = "on";
-		unset($avahi_config['disable_ipv6']);
-		$changes++;
-	}
-	if ($changes > 0 ) {
-		write_config("[avahi] Upgraded old package configuration.");
-	}
-}
-
-function avahi_validate_input($post, &$input_errors) {
-	if (($post['enable_ipv4'] != "on" ) && ($post['enable_ipv6'] != "on" )) {
-		$input_errors[] = gettext("You cannot disable both IPv4 and IPv6!");
-	}
-	if (($post['enable_ipv4'] != "on" ) && ($post['publish_aaaa_on_ipv4'] == "on" )) {
-		$input_errors[] = gettext("'Publish AAAA records on IPv4' makes no sense with IPv4 disabled.");
-	}
-	if (($post['enable_ipv6'] != "on" ) && ($post['publish_a_on_ipv6'] == "on" )) {
-		$input_errors[] = gettext("'Publish A records on IPv6' makes no sense with IPv6 disabled.");
-	}
-	if (!empty($post['cache_max']) && !is_numericint($post['cache_max'])) {
-		$input_errors[] = gettext("Maximum Cache Size must be blank, 0, or a positive numeric integer.");
-	}
-
-}
-
-?>
diff --git a/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi.xml b/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi.xml
index e4b961c6ff45..4adff4a80f8c 100644
--- a/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi.xml
+++ b/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi.xml
@@ -3,12 +3,12 @@
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
 	<copyright>
-<![CDATA[
+	<![CDATA[
 /*
  * avahi.xml
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2009-2015 Rubicon Communications, LLC (Netgate)
+ * Copyright (c) 2018 Denny Page
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,238 +25,27 @@
  */
 	]]>
 	</copyright>
-	<title>Services: Avahi</title>
 	<name>avahi</name>
-	<include_file>/usr/local/pkg/avahi.inc</include_file>
+	<version>2.0.0</version>
+	<title>Services: Avahi</title>
+	<savetext>Change</savetext>
+	<include_file>/usr/local/pkg/avahi/avahi.inc</include_file>
 	<menu>
 		<name>Avahi</name>
+		<tooltiptext>Avahi mDNS/DNS-SD</tooltiptext>
 		<section>Services</section>
-		<url>/pkg_edit.php?xml=avahi.xml</url>
+		<url>/avahi_settings.php</url>
 	</menu>
 	<service>
 		<name>avahi</name>
 		<rcfile>avahi-daemon.sh</rcfile>
 		<executable>avahi-daemon</executable>
-		<description>Avahi Zeroconf/mDNS Daemon</description>
+		<description>Avahi mDNS/DNS-SD daemon</description>
 	</service>
-	<fields>
-		<field>
-			<name>Server Options</name>
-			<type>listtopic</type>
-		</field>
-		<field>
-			<fielddescr>Enable</fielddescr>
-			<fieldname>enable</fieldname>
-			<description>Enable Avahi Bonjour/Zeroconf proxy.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Browse Domains</fielddescr>
-			<fieldname>browsedomains</fieldname>
-			<description>
-				<![CDATA[
-				Enter the (comma separated) list of domains that you would like proxied. (Example: local, pfsense.org, mydomain.com)<br />
-				(Default: local)
-				]]>
-			</description>
-			<type>input</type>
-			<default_value>local</default_value>
-		</field>
-		<field>
-			<fielddescr>Deny interfaces</fielddescr>
-			<fieldname>denyinterfaces</fieldname>
-			<description>
-				<![CDATA[
-				Interfaces that you do NOT want Avahi to listen on.<br />
-				<strong>Note: WAN is always disabled (so it is not shown here).</strong>
-				]]>
-			</description>
-			<type>interfaces_selection</type>
-			<hideinterfaceregex>(wan|loopback)</hideinterfaceregex>
-			<multiple>true</multiple>
-		</field>
-		<field>
-			<fielddescr>Enable IPv4</fielddescr>
-			<fieldname>enable_ipv4</fieldname>
-			<description>Enable IPv4 support in Avahi. (Default: enabled)</description>
-			<type>checkbox</type>
-			<default_value>on</default_value>
-			<enablefields>publish_aaaa_on_ipv4</enablefields>
-		</field>
-		<field>
-			<fielddescr>Enable IPv6</fielddescr>
-			<fieldname>enable_ipv6</fieldname>
-			<description>Enable IPv6 support in Avahi. (Default: enabled)</description>
-			<type>checkbox</type>
-			<default_value>on</default_value>
-			<enablefields>publish_a_on_ipv6</enablefields>
-		</field>
-		<field>
-			<fielddescr>Disable D-Bus</fielddescr>
-			<fieldname>disable_dbus</fieldname>
-			<description>Disable D-Bus client API support in Avahi. (Default: no)</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Maximum Cache Size</fielddescr>
-			<fieldname>cache_max</fieldname>
-			<description>The size of the object cache. Leave blank for default, 0 to disable. Disabling the cache can help with object duplication when reflecting.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<name>Wide Area</name>
-			<type>listtopic</type>
-		</field>
-		<field>
-			<fielddescr>Enable Wide-Area DNS-SD</fielddescr>
-			<fieldname>enable_wide_area</fieldname>
-			<description>Enable wide-area DNS-SD, aka DNS-SD over unicast DNS. (Default: enabled)</description>
-			<sethelp>
-				<![CDATA[
-				If this is enabled only domains ending in .local will be resolved on mDNS, all other domains
-				are resolved via unicast DNS.<br />
-				If you want to maintain multiple different multicast DNS domains even with this option enabled,
-				use subdomains of .local, such as "kitchen.local".<br />
-				]]>
-			</sethelp>
-			<type>checkbox</type>
-			<default_value>on</default_value>
-		</field>
-		<field>
-			<name>Publishing Options</name>
-			<type>listtopic</type>
-		</field>
-		<field>
-			<fielddescr>Disable Publishing</fielddescr>
-			<fieldname>disable_publishing</fieldname>
-			<description>Disable publishing of services and address records. (Default: no)</description>
-			<sethelp>
-				<![CDATA[
-				If checked, records will not be published by Avahi, not even address records for the local host.
-				Avahi will be started in a querying-only mode. This can be used as a security measure. <br />
-				<strong>Warning: Do NOT disable publishing unless absolutely required!</strong><br />
-				]]>
-			</sethelp>
-			<type>checkbox</type>
-			<default_value>off</default_value>
-		</field>
-		<field>
-			<fielddescr>Disable User Service Publishing</fielddescr>
-			<fieldname>disable_user_service_publishing</fieldname>
-			<description>Disable publishing for user services (Default: no)</description>
-			<sethelp>
-				<![CDATA[
-				If checked, Avahi will still publish records but will not allow user applications to publish services.
-				This can be used as a security measure. <br />
-				]]>
-			</sethelp>
-			<type>checkbox</type>
-			<default_value>off</default_value>
-		</field>
-		<field>
-			<fielddescr>Add Service Cookie</fielddescr>
-			<fieldname>add_service_cookie</fieldname>
-			<description>Add an implicit TXT entry to all locally registered services. (Default: disabled)</description>
-			<sethelp>This can be used to detect if two services on two different interfaces/protocols are actually identical.</sethelp>
-			<type>checkbox</type>
-			<default_value>off</default_value>
-		</field>
-		<field>
-			<fielddescr>Publish Addresses</fielddescr>
-			<fieldname>publish_addresses</fieldname>
-			<description>Register mDNS address records for all local IP addresses (Default: enabled)</description>
-			<sethelp>
-				<![CDATA[
-				If enabled, Avahi will register mDNS address records for all local IP addresses. Unless Avahi will be used exclusively
-				for browsing, enable this option. This option must be enabled to register local services.<br />
-				]]>
-			</sethelp>
-			<type>checkbox</type>
-			<default_value>on</default_value>
-		</field>
-		<field>
-			<fielddescr>Publish HINFO</fielddescr>
-			<fieldname>publish_hinfo</fieldname>
-			<description>Register an mDNS HINFO record on all interfaces with local info. (Default: enabled)</description>
-			<sethelp>
-				<![CDATA[
-				If enabled, Avahi will register an mDNS HINFO record on all interfaces containing information about the local operating system and CPU.<br />
-				This is recommended by the mDNS specification but not required. This feature may be disabled for security and privacy reasons.<br />
-				]]>
-			</sethelp>
-			<type>checkbox</type>
-			<default_value>on</default_value>
-		</field>
-		<field>
-			<fielddescr>Publish Workstation</fielddescr>
-			<fieldname>publish_workstation</fieldname>
-			<description>Register a service of type &quot;_workstation._tcp&quot; on the local LAN. (Default: enabled)</description>
-			<sethelp>This is useful for administrative purposes, such as browsing for all PCs on the LAN.</sethelp>
-			<type>checkbox</type>
-			<default_value>on</default_value>
-		</field>
-		<field>
-			<fielddescr>Publish DNS Servers</fielddescr>
-			<fieldname>publish_resolv_conf_dns_servers</fieldname>
-			<description>Publish the system unicast DNS servers (Default: disabled)</description>
-			<sethelp>
-				<![CDATA[
-				Publish the unicast DNS servers configured in <strong>System &gt; General Setup</strong> to announce them using mDNS<br />
-				When used in conjunction with avahi-dnsconfd on the client side this allows DHCP-like configuration of unicast DNS servers.<br />
-				]]>
-			</sethelp>
-			<type>checkbox</type>
-			<default_value>off</default_value>
-		</field>
-		<field>
-			<fielddescr>Publish AAAA records on IPv4</fielddescr>
-			<fieldname>publish_aaaa_on_ipv4</fieldname>
-			<description>Publish IPv6 AAAA record via IPv4 (Default: enabled)</description>
-			<sethelp>If enabled, Avahi will publish an IPv6 AAAA record via IPv4, allowing the local IPv6 addresses to be resolved using IPv4.</sethelp>
-			<type>checkbox</type>
-			<default_value>on</default_value>
-		</field>
-		<field>
-			<fielddescr>Publish A records on IPv6</fielddescr>
-			<fieldname>publish_a_on_ipv6</fieldname>
-			<description>Publish IPv4 A record via IPv6 (Default: disabled)</description>
-			<sethelp>If enabled, Avahi will publish an IPv4 A record via IPv6, allowing the local IPv4 addresses to be resolved using IPv6.</sethelp>
-			<type>checkbox</type>
-			<default_value>off</default_value>
-		</field>
-		<field>
-			<name>Reflector Options</name>
-			<type>listtopic</type>
-		</field>
-		<field>
-			<fielddescr>Enable Reflector</fielddescr>
-			<fieldname>enable_reflector</fieldname>
-			<description>Reflect incoming mDNS requests to all local network interfaces (Default: enabled)</description>
-			<sethelp>
-				<![CDATA[
-				If enabled, Avahi will reflect incoming mDNS requests to all local network interfaces,
-				effectively allowing clients to browse mDNS/DNS-SD services on all networks connected to the gateway.<br />
-				]]>
-			</sethelp>
-			<type>checkbox</type>
-			<default_value>on</default_value>
-		</field>
-		<field>
-			<fielddescr>Reflect IPv</fielddescr>
-			<fieldname>reflect_ipv</fieldname>
-			<description>Forward mDNS traffic between IPv4 and IPv6 (Default: disabled)</description>
-			<sethelp>If enabled, Avahi will forward mDNS traffic between IPv4 and IPv6, which is usually not recommended.</sethelp>
-			<type>checkbox</type>
-			<default_value>off</default_value>
-		</field>
-	</fields>
 	<custom_php_resync_config_command>
-		avahi_sync();
+		avahi_sync_config();
 	</custom_php_resync_config_command>
-	<custom_php_install_command>
-		avahi_upgrade_config();
-	</custom_php_install_command>
-	<custom_php_validation_command>
-		avahi_validate_input($_POST, $input_errors);
-	</custom_php_validation_command>
+	<custom_php_pre_deinstall_command>
+		avahi_deinstall_command();
+	</custom_php_pre_deinstall_command>
 </packagegui>
diff --git a/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi/avahi.inc b/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi/avahi.inc
new file mode 100644
index 000000000000..9ec9f1725d2e
--- /dev/null
+++ b/net/pfSense-pkg-Avahi/files/usr/local/pkg/avahi/avahi.inc
@@ -0,0 +1,128 @@
+<?php
+/*
+ * avahi.inc
+ *
+ * part of pfSense (https://www.pfsense.org)
+ * Copyright (c) 2018 Denny Page
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+require_once("config.inc");
+require_once("functions.inc");
+require_once("util.inc");
+require_once("service-utils.inc");
+
+define("AVAHI_CONFIG_FILE", "/usr/local/etc/avahi/avahi-daemon.conf");
+define("AVAHI_RC_FILE", "/usr/local/etc/rc.d/avahi-daemon.sh");
+define("AVAHI_DAEMON", "/usr/local/sbin/avahi-daemon");
+
+
+function avahi_write_config($avahi_config) {
+	$txt = "# This file is generated by the pfSense Avahi package.\n";
+	$txt .= "# Do not edit this file, it will be overwritten automatically.\n";
+
+	$txt .= "\n[server]\n";
+	$real_interfaces = array();
+	foreach (explode(',', $avahi_config['interfaces']) as $i) {
+		$real_interfaces[$i] = get_real_interface($i);
+	}
+	$txt .= "allow-interfaces=" . implode(',', $real_interfaces) . "\n";
+	$txt .= "use-ipv4=" . ($avahi_config['disable_ipv4'] ? "no" : "yes") . "\n";
+	$txt .= "use-ipv6=" . ($avahi_config['disable_ipv6'] ? "no" : "yes") . "\n";
+
+	if (!empty($avahi_config['override_hostname'])) {
+		$txt .= "host-name=" . $avahi_config['override_hostname'] . "\n";
+	}
+	if (!empty($avahi_config['override_domain'])) {
+		$txt .= "domain-name=" . $avahi_config['override_domain'] . "\n";
+	}
+	$txt .= "enable-dbus=no\n";
+	$txt .= "cache-entries-max=0\n";
+
+	$txt .= "\n[wide-area]\n";
+	$txt .= "enable-wide-area=no\n";
+
+	$txt .= "\n[publish]\n";
+	$txt .= "disable-publishing=" . ($avahi_config['publishing'] ? "no" : "yes") . "\n";
+	$txt .= "publish-addresses=" . ($avahi_config['publish_addresses'] ? "yes" : "no") . "\n";
+	$txt .= "publish-hinfo=" . ($avahi_config['publish_hinfo'] ? "yes" : "no") . "\n";
+	$txt .= "publish-workstation=" . ($avahi_config['publish_workstation'] ? "yes" : "no") . "\n";
+	$txt .= "publish-domain=" . ($avahi_config['publish_domain'] ? "yes" : "no") . "\n";
+	$txt .= "publish-aaaa-on-ipv4=" . ($avahi_config['publish_ipv4_aaaa'] ? "yes" : "no") . "\n";
+	$txt .= "publish-a-on-ipv6=" . ($avahi_config['publish_ipv6_a'] ? "yes" : "no") . "\n";
+	$txt .= "disable-user-service-publishing=yes\n";
+
+	$txt .= "\n[reflector]\n";
+	$txt .= "enable-reflector=" . ($avahi_config['reflection'] ? "yes" : "no") . "\n";
+
+	if (!file_put_contents(AVAHI_CONFIG_FILE, $txt)) {
+		log_error("ERROR: Could not open {" . AVAHI_CONFIG_FILE . "} for writing");
+		exit;
+	}
+}
+
+
+function avahi_sync_config() {
+	global $config;
+
+	if (is_service_running('avahi')) {
+		log_error("Stopping service avahi");
+		stop_service('avahi');
+	}
+
+	$avahi_config = &$config['installedpackages']['avahi']['config'][0];
+	if (isset($avahi_config['enable'])) {
+		$enable = $avahi_config['enable'];
+	} else {
+		$enable = 'no';
+	}
+
+	if ($enable !== 'yes') {
+		unlink_if_exists(AVAHI_RCFILE);
+		return;
+	}
+
+	/* Write the config file */
+	avahi_write_config($avahi_config);
+
+	/* Write the rc script */
+	$cmd = AVAHI_DAEMON;
+	$start = "	$cmd -D";
+	$stop = "	/usr/bin/killall -q avahi-daemon";
+	write_rcfile(array(
+		"file" => "avahi-daemon.sh",
+		"start" => $start,
+		"stop" => $stop
+		)
+	);
+
+	if (platform_booting()) {
+		return;
+	}
+
+	log_error("Starting service avahi");
+	start_service('avahi');
+}
+
+
+function avahi_deinstall_command() {
+	if (is_service_running('avahi')) {
+		log_error("Stopping service avahi");
+		stop_service('avahi');
+	}
+
+	unlink_if_exists(AVAHI_RCFILE);
+}
diff --git a/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml b/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml
index 9e808cf882eb..eac9bebc98ec 100644
--- a/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml
+++ b/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml
@@ -2,14 +2,10 @@
 <pfsensepkgs>
 	<package>
 		<name>Avahi</name>
-		<pkginfolink>https://doc.pfsense.org/index.php/Avahi_package</pkginfolink>
+		<pkginfolink>https://forum.netgate.com/topic/134339</pkginfolink>
 		<website>http://www.avahi.org/</website>
-		<descr><![CDATA[Avahi is a system which facilitates service discovery on a local network via the mDNS/DNS-SD protocol suite.&lt;br/&gt;
-			This enables you to plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared.&lt;br/&gt;
-			In addition it supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments.&lt;br/&gt;
-			Compatible technology is found in Apple MacOS X (branded ​Bonjour and sometimes Zeroconf).]]></descr>
+		<descr><![CDATA[Avahi is a system which facilitates host and service discovery in local networks via mDNS (Multicast DNS) and DNS-SD (DNS Service Discovery).]]></descr>
 		<version>%%PKGVERSION%%</version>
 		<configurationfile>avahi.xml</configurationfile>
-		<after_install_info>Please visit Services - Avahi menu, enable the service and select which interfaces you do NOT wish Avahi to listen on. Save settings to start the service.</after_install_info>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-Avahi/files/usr/local/www/avahi_settings.php b/net/pfSense-pkg-Avahi/files/usr/local/www/avahi_settings.php
new file mode 100644
index 000000000000..dd058d6f02b2
--- /dev/null
+++ b/net/pfSense-pkg-Avahi/files/usr/local/www/avahi_settings.php
@@ -0,0 +1,373 @@
+<?php
+/*
+ * avahi_settings.php
+ *
+ * part of pfSense (https://www.pfsense.org)
+ * Copyright (c) 2018 Denny Page
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+require("guiconfig.inc");
+require("/usr/local/pkg/avahi/avahi.inc");
+
+if (!is_array($config['installedpackages']['avahi']['config'])) {
+	$config['installedpackages']['avahi']['config'] = array();
+}
+$a_avahi = &$config['installedpackages']['avahi']['config'][0];
+
+
+if (isset($a_avahi)) {
+	if (isset($a_avahi['interfaces'])) {
+		$pconfig = $a_avahi;
+	} elseif (isset($a_avahi['denyinterfaces'])) {
+		$pconfig['enable'] = $a_avahi['enable'];
+
+		$available_interfaces = get_configured_interface_list();
+		unset($available_interfaces['wan']);
+		$deny_interfaces = explode(',', $a_avahi['denyinterfaces']);
+		foreach ($deny_interfaces as $i) {
+			unset($available_interfaces[$i]);
+		}
+		$pconfig['interfaces'] = implode(',', $available_interfaces);
+
+		$pconfig['disable_ipv4'] = !$a_avahi['enable_ipv4'];
+		$pconfig['disable_ipv6'] = !$a_avahi['enable_ipv6'];
+		/* override_hostname was not available in prior config */
+		/* override_domain was not available in prior config */
+
+		$pconfig['publishing'] = !$a_avahi['disable_publishing'];
+		if ($pconfig['publishing']) {
+			$pconfig['publish_addresses'] = $a_avahi['publish_addresses'];
+			$pconfig['publish_hinfo'] = $a_avahi['publish_hinfo'];
+			$pconfig['publish_workstation'] = $a_avahi['publish_workstation'];
+			/* publish_domain was not available in prior config */
+			$pconfig['publish_ipv4_aaaa'] = $a_avahi['publish_aaaa_on_ipv4'];
+			$pconfig['publish_ipv6_a'] = $a_avahi['publish_a_on_ipv6'];
+		}
+
+		$pconfig['reflection'] = $a_avahi['enable_reflector'];
+
+		$migration_warning = gettext("WARNING: An attempt has been made to migrate the prior Avahi configuration. Please review the settings below carefully before saving. The prior Avahi configuration will be lost when the new configuration is saved.");
+	} else {
+		$pconfig['interfaces'] = 'lan';
+	}
+}
+
+
+if ($_POST) {
+	unset($input_errors);
+	$pconfig = $_POST;
+
+	$pconfig['interfaces'] = implode(',', $pconfig['interfaces_a']);
+
+	/* Confirm at least one interface has been chosen */
+	if (empty($pconfig['interfaces_a'])) {
+		$input_errors[] = gettext("At least one interface must be selected");
+	}
+
+	/* Confirm that at least one protocol is enabled */
+	if ($pconfig['disable_ipv4'] == "yes" && $pconfig['disable_ipv6'] == "yes") {
+		$input_errors[] = gettext("At least one IP protocol must be enabled");
+	}
+
+	/* Confirm valid characters in host and domain names if specified */
+	if ($pconfig['override_hostname'] && !preg_match('/^[a-zA-Z0-9-]+$/', $pconfig['override_hostname'])) {
+		$input_errors[] = gettext("Host name may contain [a-zA-Z0-9-] only");
+	}
+	if ($pconfig['override_domain'] && !preg_match('/^[a-zA-Z0-9-.]+$/', $pconfig['override_domain'])) {
+		$input_errors[] = gettext("Domain name may contain [a-zA-Z0-9-.] only");
+	}
+
+	if (!$input_errors) {
+		$avahi = array();
+
+		$avahi['enable'] = $pconfig['enable'];
+		$avahi['interfaces'] = $pconfig['interfaces'];
+		$avahi['disable_ipv4'] = $pconfig['disable_ipv4'];
+		$avahi['disable_ipv6'] = $pconfig['disable_ipv6'];
+		$avahi['reflection'] = $pconfig['reflection'];
+		$avahi['override_hostname'] = $pconfig['override_hostname'];
+		$avahi['override_domain'] = $pconfig['override_domain'];
+
+		$avahi['publishing'] = $pconfig['publishing'];
+		if ($pconfig['publishing']) {
+			$avahi['publish_addresses'] = $pconfig['publish_addresses'];
+			$avahi['publish_hinfo'] = $pconfig['publish_hinfo'];
+			$avahi['publish_workstation'] = $pconfig['publish_workstation'];
+			$avahi['publish_domain'] = $pconfig['publish_domain'];
+			$avahi['publish_ipv4_aaaa'] = $pconfig['publish_ipv4_aaaa'];
+			$avahi['publish_ipv6_a'] = $pconfig['publish_ipv6_a'];
+		}
+
+		$a_avahi = $avahi;
+		write_config("Updated Avahi settings");
+
+		avahi_sync_config();
+
+		header("Location: avahi_settings.php");
+		exit;
+	}
+}
+
+
+$available_interfaces = get_configured_interface_with_descr();
+unset($available_interfaces['wan']);
+$pconfig['interfaces_a'] = explode(',', $pconfig['interfaces']);
+
+
+$pgtitle = array(gettext("Services"), gettext("Avahi"));
+include("head.inc");
+
+
+if (isset($migration_warning)) {
+	print_info_box($migration_warning);
+}
+
+if ($input_errors) {
+	print_input_errors($input_errors);
+}
+
+
+$form = new Form;
+$section = new Form_Section('General Settings');
+
+$section->addInput(new Form_Checkbox(
+	'enable',
+	'Enable',
+	'Enable the Avahi daemon',
+	$pconfig['enable']
+));
+
+$section->addInput(new Form_Select(
+	'interfaces_a',
+	'Interfaces',
+	$pconfig['interfaces_a'],
+	$available_interfaces,
+	true
+))->setHelp(
+	'Interfaces that the Avahi daemon will listen and send on'
+);
+
+$section->addInput(new Form_Checkbox(
+	'disable_ipv4',
+	'Disable IPv4',
+	'Disable support for IPv4',
+	$pconfig['disable_ipv4']
+));
+
+$section->addInput(new Form_Checkbox(
+	'disable_ipv6',
+	'Disable IPv6',
+	'Disable support for IPv6',
+	$pconfig['disable_ipv6']
+));
+
+$section->addInput(new Form_Checkbox(
+	'reflection',
+	'Enable reflection',
+	'Repeat mdns packets across subnets',
+	$pconfig['reflection']
+))->setHelp(
+	'This option allows clients in one subnet to browse for clients and services located in different subnets.'
+);
+
+$form->add($section);
+
+
+$section = new Form_Section('Publishing');
+
+$section->addInput(new Form_Checkbox(
+	'publishing',
+	'Enable publishing',
+	'Enable publishing of information about the pfSense host',
+	$pconfig['publishing']
+))->setHelp(
+	'Use with caution. Publishing can reveal a good deal of information about your pfSense host.%sNote that this option enables publishing of default system services such as ssh and ftp-ssh.', '<br/>'
+);
+
+$group = new Form_Group('Publish addresses');
+$group->addClass('publishing');
+$group->add(new Form_Checkbox(
+	'publish_addresses',
+	'Publish addresses',
+	'Publish address records for the pfSense host',
+	$pconfig['publish_addresses']
+));
+$section->add($group);
+
+$group = new Form_Group('Publish host info');
+$group->addClass('publishing');
+$group->add(new Form_Checkbox(
+	'publish_hinfo',
+	'Publish host info',
+	'Publish a host information record (OS and CPU info) for the pfSense host',
+	$pconfig['publish_hinfo']
+));
+$section->add($group);
+
+$group = new Form_Group('Publish workstation');
+$group->addClass('publishing');
+$group->add(new Form_Checkbox(
+	'publish_workstation',
+	'Publish workstation',
+	'Publish a workstation record for the pfSense host',
+	$pconfig['publish_workstation']
+));
+$section->add($group);
+
+$group = new Form_Group('Publish domain');
+$group->addClass('publishing');
+$group->add(new Form_Checkbox(
+	'publish_domain',
+	'Publish Domain',
+	'Publish the domain name in use by the pfSense host',
+	$pconfig['publish_domain']
+));
+$section->add($group);
+
+$button = new Form_Button(
+	'advancedbutton',
+	'Display Advanced',
+	null,
+	'fa-cog'
+);
+$button->setAttribute('type', 'button')->addClass('btn-info btn-sm');
+$section->addInput(new Form_StaticText(
+	null,
+	$button
+));
+
+$form->add($section);
+
+
+$section = new Form_Section('Advanced settings');
+$section->addClass('advanced');
+
+$group = new Form_Group('Override host name');
+$group->add(new Form_Input(
+	'override_hostname',
+	'Override host name',
+	'text',
+	$pconfig['override_hostname']
+))->sethelp('Override the host name used for publishing mdns records. The default is the system host name.');
+$section->add($group);
+
+$group = new Form_Group('Override domain');
+$group->add(new Form_Input(
+	'override_domain',
+	'Override domain',
+	'text',
+	$pconfig['override_domain']
+))->sethelp('Override the domain name used for publishing mdns records. The default is "local".');
+$section->add($group);
+
+$group = new Form_Group('IPv4 AAAA records');
+$group->addClass('publishing');
+$group->add(new Form_Checkbox(
+	'publish_ipv4_aaaa',
+	'IPv4 AAAA records',
+	'Enable publishing of local IPv6 addresses (AAAA records) via IPv4',
+	$pconfig['publish_ipv4_aaaa']
+));
+$section->add($group);
+
+$group = new Form_Group('IPv6 A records');
+$group->addClass('publishing');
+$group->add(new Form_Checkbox(
+	'publish_ipv6_a',
+	'IPv6 A records',
+	'Enable publishing of local IPv4 addresses (A records) via IPv6',
+	$pconfig['publish_ipv6_a']
+));
+$section->add($group);
+$form->add($section);
+
+print($form);
+?>
+
+
+<script type="text/javascript">
+//<![CDATA[
+events.push(function() {
+	var showadvanced = false;
+
+	function publishingChange() {
+		var hide = !$('#publishing').prop('checked')
+		hideClass('publishing', hide);
+	}
+
+	function IPv4Change() {
+		var hide = $('#disable_ipv4').prop('checked')
+		disableInput('publish_ipv4_aaaa', hide);
+	}
+	function IPv6Change() {
+		var hide = $('#disable_ipv6').prop('checked')
+		disableInput('publish_ipv6_a', hide);
+	}
+
+	function advancedChange(pageload) {
+		var text;
+
+		if (pageload) {
+			// Initial page load
+			showadvanced = <?php
+				if (empty($pconfig['hostname']) && empty($pconfig['domain']) && !$pconfig['publish_ipv4_aaaa'] && !$pconfig['publish_ipv6_a']) {
+					echo 'false';
+				} else {
+					echo 'true';
+				}
+			?>
+		} else {
+			showadvanced = !showadvanced;
+		}
+
+		hideClass('advanced', !showadvanced);
+
+		if (showadvanced) {
+			text = "<?=gettext('Hide Advanced');?>";
+		} else {
+			text = "<?=gettext('Display Advanced');?>";
+		}
+		$('#advancedbutton').html('<i class="fa fa-cog"></i> ' + text);
+	}
+
+	// Show/Hide publish settings
+	$('#publishing').click(function() {
+		publishingChange();
+	});
+
+	$('#disable_ipv4').click(function() {
+		IPv4Change();
+	});
+	$('#disable_ipv6').click(function() {
+		IPv6Change();
+	});
+
+	// Show/Hide advanced section
+	$('#advancedbutton').click(function(event) {
+		advancedChange(false);
+	});
+
+	// Initial page load
+	publishingChange();
+	IPv4Change();
+	IPv6Change();
+	advancedChange(true);
+});
+//]]>
+</script>
+
+<?php include("foot.inc");
diff --git a/net/pfSense-pkg-Avahi/pkg-descr b/net/pfSense-pkg-Avahi/pkg-descr
index c3c53a43d01d..f0ef85516343 100644
--- a/net/pfSense-pkg-Avahi/pkg-descr
+++ b/net/pfSense-pkg-Avahi/pkg-descr
@@ -1,12 +1,7 @@
-Avahi is a system which facilitates service discovery on a local network via the
-mDNS/DNS-SD protocol suite.<br/>
-			This enables you to plug your laptop or computer into a
-			network and instantly be able to view other people who
-			you can chat with, find printers to print to or find
-			files being shared.<br/> In addition it supports some
-			nifty things that have never been seen elsewhere like
-			correct mDNS reflection across LAN segments.<br/>
-			Compatible technology is found in Apple MacOS X (branded
-			Bonjour and sometimes Zeroconf).
+Avahi is a system which facilitates host and service discovery in local
+networks via mDNS (Multicast DNS) and DNS-SD (DNS Service Discovery).
+This package allows mDNS/DNS-SD protocols to work across multiple LAN
+segments. mDNS/DNS-SD is known in Apple circles as "Bounjour" and is
+part of the Zeroconf suite of protocols.
 
-WWW: https://doc.pfsense.org/index.php/Avahi_package
+WWW: https://forum.netgate.com/topic/134339
diff --git a/net/pfSense-pkg-Avahi/pkg-message b/net/pfSense-pkg-Avahi/pkg-message
deleted file mode 100644
index fb8004590b80..000000000000
--- a/net/pfSense-pkg-Avahi/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-************************************************************************
-
-Please visit Services - Avahi menu, enable the service and select which
-interfaces you do NOT wish Avahi to listen on.  Save settings to start
-the service.
-
-************************************************************************
diff --git a/net/pfSense-pkg-Avahi/pkg-plist b/net/pfSense-pkg-Avahi/pkg-plist
index 91cc6a565ab6..c5700f08bef8 100644
--- a/net/pfSense-pkg-Avahi/pkg-plist
+++ b/net/pfSense-pkg-Avahi/pkg-plist
@@ -1,7 +1,6 @@
 pkg/avahi.xml
-pkg/avahi.inc
+pkg/avahi/avahi.inc
 /etc/inc/priv/avahi.priv.inc
-etc/avahi/ssh.service
-etc/avahi/sftp-ssh.service
+www/avahi_settings.php
 %%DATADIR%%/info.xml
 @dir /etc/inc/priv