Merge branch 'master' of git.pfmechanics.com:pfsense/pfsense

137 files changed, 370 insertions, 500 deletions

diff --git a/src/etc/ecl.php b/src/etc/ecl.php
index b0a1507..20c702f 100755
--- a/src/etc/ecl.php
+++ b/src/etc/ecl.php
@@ -2,7 +2,7 @@
 /*
  * ecl.php
  *
- * Copyright (c) 2010-2015 Electric Sheep Fencing, LLC. All rights reserved.
+ * Copyright (c) 2010-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.
diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc
index eb18765..20d8a35 100644
--- a/src/etc/inc/auth.inc
+++ b/src/etc/inc/auth.inc
@@ -6,7 +6,7 @@
  * Copyright (c) 2003-2006 Manuel Kasper <mk@neon1.net>
  * Copyright (c) 2005-2006 Bill Marquette <bill.marquette@gmail.com>
  * Copyright (c) 2006 Paul Taylor <paultaylor@winn-dixie.com>
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc
index 20b5581..c9fa516 100644
--- a/src/etc/inc/authgui.inc
+++ b/src/etc/inc/authgui.inc
@@ -6,7 +6,7 @@
  * Copyright (c) 2003-2006 Manuel Kasper <mk@neon1.net>
  * Copyright (c) 2005-2006 Bill Marquette <bill.marquette@gmail.com>
  * Copyright (c) 2006 Paul Taylor <paultaylor@winn-dixie.com>
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc
index a482b12..f06f36c 100644
--- a/src/etc/inc/captiveportal.inc
+++ b/src/etc/inc/captiveportal.inc
@@ -3,7 +3,7 @@
  * captiveportal.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/certs.inc b/src/etc/inc/certs.inc
index 4970314..dae7aae 100644
--- a/src/etc/inc/certs.inc
+++ b/src/etc/inc/certs.inc
@@ -3,7 +3,7 @@
  * certs.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2008-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2008-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2008 Shrew Soft Inc. All rights reserved.
  * All rights reserved.
  *
diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc
index a87b082..b4783da 100644
--- a/src/etc/inc/config.console.inc
+++ b/src/etc/inc/config.console.inc
@@ -3,7 +3,7 @@
  * config.console.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/config.gui.inc b/src/etc/inc/config.gui.inc
index de9d422..f41b912 100644
--- a/src/etc/inc/config.gui.inc
+++ b/src/etc/inc/config.gui.inc
@@ -3,7 +3,7 @@
  * config.gui.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc
index 083afdb..3efd2f3 100644
--- a/src/etc/inc/config.inc
+++ b/src/etc/inc/config.inc
@@ -3,7 +3,7 @@
  * config.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc
index 2f8fa59..d042aed 100644
--- a/src/etc/inc/config.lib.inc
+++ b/src/etc/inc/config.lib.inc
@@ -3,7 +3,7 @@
  * config.lib.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2009 Erik Kristensen
  * All rights reserved.
  *
@@ -757,7 +757,7 @@ function config_validate($conffile) {
 }
 
 function cleanup_backupcache($lock = false) {
-	global $g;
+	global $config, $g;
 	$i = false;
 
 	$revisions = intval(is_numericint($config['system']['backupcount']) ? $config['system']['backupcount'] : $g['default_config_backup_count']);
diff --git a/src/etc/inc/crypt.inc b/src/etc/inc/crypt.inc
index f3476f4..d72bbe5 100644
--- a/src/etc/inc/crypt.inc
+++ b/src/etc/inc/crypt.inc
@@ -3,7 +3,7 @@
  * crypt.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2008-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2008-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2008 Shrew Soft Inc. All rights reserved.
  * All rights reserved.
  *
diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class
index 270abd5..548b251 100644
--- a/src/etc/inc/dyndns.class
+++ b/src/etc/inc/dyndns.class
@@ -3,7 +3,7 @@
  * dyndns.class
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/easyrule.inc b/src/etc/inc/easyrule.inc
index 8420982..b86a39e 100644
--- a/src/etc/inc/easyrule.inc
+++ b/src/etc/inc/easyrule.inc
@@ -3,7 +3,7 @@
  * easyrule.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2009-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2009-2016 Rubicon Communications, LLC (Netgate)
  * Originally Sponsored By Anathematic @ pfSense Forums
  * All rights reserved.
  *
diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index 9479ba3..bac2033 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -5,7 +5,7 @@
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2005 Bill Marquette
  * Copyright (c) 2006 Peter Allgeyer
- * Copyright (c) 2008-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2008-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc
index bd91d6e..93b049c 100644
--- a/src/etc/inc/filter_log.inc
+++ b/src/etc/inc/filter_log.inc
@@ -3,7 +3,7 @@
  * filter_log.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/functions.inc b/src/etc/inc/functions.inc
index 7c56ac0..85aff1a 100644
--- a/src/etc/inc/functions.inc
+++ b/src/etc/inc/functions.inc
@@ -3,7 +3,7 @@
  * functions.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc
index cadb013..377fcd5 100644
--- a/src/etc/inc/globals.inc
+++ b/src/etc/inc/globals.inc
@@ -3,7 +3,7 @@
  * globals.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -54,7 +54,7 @@ $g = array(
 	"admin_group" => "admins",
 	"product_name" => "pfSense",
 	"product_version" => trim(file_get_contents("/etc/version"), " \n"),
-	"product_copyright" => "Electric Sheep Fencing LLC",
+	"product_copyright" => "Rubicon Communications, LLC (Netgate)",
 	"product_copyright_url" => "https://pfsense.org/license",
 	"product_copyright_years" => "2004 - ".date("Y"),
 	"product_website" => "www.pfsense.org",
@@ -101,27 +101,12 @@ if (is_numeric($g["product_version_patch"]) && $g["product_version_patch"] != "0
 }
 
 if (file_exists("/etc/platform")) {
-	$arch = php_uname("m");
-
-	if (strstr($g['product_version'], "-RELEASE")) {
-		/* This is only necessary for RELEASE */
-		$arch = ($arch == "i386") ? "" : '/' . $arch;
-		/* Full installs and NanoBSD use the same update directory and manifest in 2.x */
-		$g['update_url']="https://updates.pfsense.org/_updaters{$arch}";
-		$g['update_manifest']="https://updates.pfsense.org/manifest";
-	} else {
-		/* Full installs and NanoBSD use the same update directory and manifest in 2.x */
-		$g['update_url']="https://snapshots.pfsense.org/FreeBSD_releng/10.1/{$arch}/pfSense_HEAD/.updaters/";
-		$g['update_manifest']="https://updates.pfSense.org/manifest";
-	}
-
+	$g['update_manifest']="https://updates.pfsense.org/manifest";
 	$g['platform'] = trim(file_get_contents("/etc/platform"));
 	if ($g['platform'] == "nanobsd") {
-		$g['firmware_update_text']="pfSense-*.img.gz";
 		$g['hidebackupbeforeupgrade'] = true;
 		$g['default_config_backup_count'] = 5;
 	} else {
-		$g['firmware_update_text']="pfSense-*.tgz";
 		$g['default_config_backup_count'] = 30;
 	}
 } else { 
diff --git a/src/etc/inc/gmirror.inc b/src/etc/inc/gmirror.inc
index 83964a3..7afe632 100644
--- a/src/etc/inc/gmirror.inc
+++ b/src/etc/inc/gmirror.inc
@@ -3,7 +3,7 @@
  * gmirror.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc
index a71b0e4..f1d5e3b 100644
--- a/src/etc/inc/gwlb.inc
+++ b/src/etc/inc/gwlb.inc
@@ -4,7 +4,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2008 Bill Marquette, Seth Mos
- * Copyright (c) 2008-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2008-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 7feaf0e..3d47e39 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -3,7 +3,7 @@
  * interfaces.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally based on m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/ipsec.attributes.php b/src/etc/inc/ipsec.attributes.php
index 3cf1cf6..65ab036 100644
--- a/src/etc/inc/ipsec.attributes.php
+++ b/src/etc/inc/ipsec.attributes.php
@@ -3,7 +3,7 @@
  * ipsec.attributes.php
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2011-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2011-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/ipsec.auth-user.php b/src/etc/inc/ipsec.auth-user.php
index 5c945ac..d7d790a 100755
--- a/src/etc/inc/ipsec.auth-user.php
+++ b/src/etc/inc/ipsec.auth-user.php
@@ -5,7 +5,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2008 Shrew Soft Inc
- * Copyright (c) 2008-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2008-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/ipsec.inc b/src/etc/inc/ipsec.inc
index a77e485..76b8694 100644
--- a/src/etc/inc/ipsec.inc
+++ b/src/etc/inc/ipsec.inc
@@ -4,7 +4,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2008 Shrew Soft Inc.
- * Copyright (c) 2007-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2007-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/itemid.inc b/src/etc/inc/itemid.inc
index 6251928..1fe4809 100644
--- a/src/etc/inc/itemid.inc
+++ b/src/etc/inc/itemid.inc
@@ -3,7 +3,7 @@
  * itemid.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2009-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2009-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2009 Janne Enberg <janne.enberg@lietu.net>
  * All rights reserved.
  *
diff --git a/src/etc/inc/led.inc b/src/etc/inc/led.inc
index 647f69c..17b96e2 100644
--- a/src/etc/inc/led.inc
+++ b/src/etc/inc/led.inc
@@ -3,7 +3,7 @@
  * led.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2009-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2009-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/meta.inc b/src/etc/inc/meta.inc
index a58c1fe..f366072 100644
--- a/src/etc/inc/meta.inc
+++ b/src/etc/inc/meta.inc
@@ -4,7 +4,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2008 Shrew Soft Inc
- * Copyright (c) 2008-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2008-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/notices.inc b/src/etc/inc/notices.inc
index 9bda4c7..2df36c3 100644
--- a/src/etc/inc/notices.inc
+++ b/src/etc/inc/notices.inc
@@ -4,7 +4,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2005 Colin Smith (ethethlay@gmail.com)
- * Copyright (c) 2005-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2005-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/openvpn.attributes.php b/src/etc/inc/openvpn.attributes.php
index 95239f6..44b2a34 100644
--- a/src/etc/inc/openvpn.attributes.php
+++ b/src/etc/inc/openvpn.attributes.php
@@ -3,7 +3,7 @@
  * openvpn.attributes.php
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2011-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2011-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/openvpn.auth-user.php b/src/etc/inc/openvpn.auth-user.php
index cbbe1f7..e2a6549 100644
--- a/src/etc/inc/openvpn.auth-user.php
+++ b/src/etc/inc/openvpn.auth-user.php
@@ -5,7 +5,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2008 Shrew Soft Inc
- * Copyright (c) 2008-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2008-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc
index 117aba9..426f06b 100644
--- a/src/etc/inc/openvpn.inc
+++ b/src/etc/inc/openvpn.inc
@@ -4,7 +4,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2006 Fernando Lemos
- * Copyright (c) 2006-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * This file was rewritten from scratch by Fernando Lemos but
diff --git a/src/etc/inc/openvpn.tls-verify.php b/src/etc/inc/openvpn.tls-verify.php
index 46c8ff7..b4cfd24 100644
--- a/src/etc/inc/openvpn.tls-verify.php
+++ b/src/etc/inc/openvpn.tls-verify.php
@@ -4,7 +4,7 @@
  * openvpn.tls-verify.php
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2011-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2011-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index ebf80a8..236d02c 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -3,7 +3,7 @@
  * pfsense-utils.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc
index 4699f68..0531415 100644
--- a/src/etc/inc/pkg-utils.inc
+++ b/src/etc/inc/pkg-utils.inc
@@ -4,7 +4,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2005-2006 Colin Smith (ethethlay@gmail.com)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/priv.inc b/src/etc/inc/priv.inc
index 3ce857d..954f65e 100644
--- a/src/etc/inc/priv.inc
+++ b/src/etc/inc/priv.inc
@@ -3,7 +3,7 @@
  * priv.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2005-2006 Bill Marquette <bill.marquette@gmail.com>
  * Copyright (c) 2006 Paul Taylor <paultaylor@winn-dixie.com>.
  * Copyright (c) 2008 Shrew Soft Inc
diff --git a/src/etc/inc/rrd.inc b/src/etc/inc/rrd.inc
index b324d8c..2539af3 100644
--- a/src/etc/inc/rrd.inc
+++ b/src/etc/inc/rrd.inc
@@ -4,7 +4,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl>
- * Copyright (c) 2010-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2010-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/service-utils.inc b/src/etc/inc/service-utils.inc
index d053b24..793740e 100644
--- a/src/etc/inc/service-utils.inc
+++ b/src/etc/inc/service-utils.inc
@@ -3,7 +3,7 @@
  * service-utils.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2005-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2005-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2005-2006 Colin Smith (ethethlay@gmail.com)
  * All rights reserved.
  *
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 0d4ab92..b5adc7f 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -3,7 +3,7 @@
  * services.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
@@ -1346,12 +1346,11 @@ EOD;
 		}
 		$ifcfgsnv6 = get_interface_subnetv6($dhcpv6if);
 		$subnetv6 = gen_subnetv6($ifcfgipv6, $ifcfgsnv6);
-
-		if ($ifcfgv6['ipaddrv6'] == 'track6') {
-			$trackifname = $config['interfaces'][$ifname]['track6-interface'];
-			$trackcfg = $config['interfaces'][$trackifname];
-			$pdlen = 64 - $trackcfg['dhcp6-ia-pd-len'];
-		}
+		// We might have some prefix-delegation on WAN (e.g. /48),
+		// but then it is split and given out to individual interfaces
+		// (LAN, OPT1, OPT2...) as multiple /64 subnets. So the size
+		// of each subnet here is always /64.
+		$pdlen = 64;
 
 		if ($is_olsr_enabled == true) {
 			if ($dhcpv6ifconf['netmask']) {
diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc
index 6cba885..90f068d 100644
--- a/src/etc/inc/shaper.inc
+++ b/src/etc/inc/shaper.inc
@@ -3,7 +3,7 @@
  * shaper.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally based on m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 178f046..0914c19 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -3,7 +3,7 @@
  * system.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
@@ -393,10 +393,8 @@ function system_hosts_generate() {
 						$ipaddrv6 = $host['ipaddrv6'];
 						if ($ipaddrv6 && $host['hostname']) {
 							if ($isdelegated) {
-								$trackifname = $config['interfaces'][$dhcpif]['track6-interface'];
-								$trackcfg = $config['interfaces'][$trackifname];
-								$pdlen = 64 - $trackcfg['dhcp6-ia-pd-len'];
-								$ipaddrv6 = merge_ipv6_delegated_prefix(get_interface_ipv6($dhcpif), $ipaddrv6, $pdlen);
+								// We are always in an "end-user" subnet here, which all are /64 for IPv6.
+								$ipaddrv6 = merge_ipv6_delegated_prefix(get_interface_ipv6($dhcpif), $ipaddrv6, 64);
 							}
 							if ($host['domain']) {
 								$dhosts .= "{$ipaddrv6}	{$host['hostname']}.{$host['domain']}\n";
@@ -835,7 +833,7 @@ function clear_all_log_files($restart = false) {
 	global $g;
 	exec("/usr/bin/killall syslogd");
 
-	$log_files = array("system", "filter", "dhcpd", "vpn", "pptps", "poes", "l2tps", "openvpn", "portalauth", "ipsec", "ppp", "relayd", "wireless", "nginx", "ntpd", "gateways", "resolver", "routing");
+	$log_files = array("system", "filter", "dhcpd", "vpn", "poes", "l2tps", "openvpn", "portalauth", "ipsec", "ppp", "relayd", "wireless", "nginx", "ntpd", "gateways", "resolver", "routing");
 	foreach ($log_files as $lfile) {
 		clear_log_file("{$g['varlog_path']}/{$lfile}.log", false);
 	}
@@ -876,11 +874,11 @@ function system_syslogd_start() {
 
 	$syslogd_extra = "";
 	if (isset($syslogcfg)) {
-		$separatelogfacilities = array('ntp', 'ntpd', 'ntpdate', 'charon', 'ipsec_starter', 'openvpn', 'pptps', 'poes', 'l2tps', 'relayd', 'hostapd', 'dnsmasq', 'filterdns', 'unbound', 'dhcpd', 'dhcrelay', 'dhclient', 'dhcp6c', 'dpinger', 'radvd', 'routed', 'olsrd', 'zebra', 'ospfd', 'bgpd', 'miniupnpd', 'filterlog');
+		$separatelogfacilities = array('ntp', 'ntpd', 'ntpdate', 'charon', 'ipsec_starter', 'openvpn', 'poes', 'l2tps', 'relayd', 'hostapd', 'dnsmasq', 'filterdns', 'unbound', 'dhcpd', 'dhcrelay', 'dhclient', 'dhcp6c', 'dpinger', 'radvd', 'routed', 'olsrd', 'zebra', 'ospfd', 'bgpd', 'miniupnpd', 'filterlog');
 		$syslogconf = "";
 		if ($config['installedpackages']['package']) {
 			foreach ($config['installedpackages']['package'] as $package) {
-				if ($package['logging']) {
+				if (isset($package['logging']['facilityname']) && isset($package['logging']['logfilename'])) {
 					array_push($separatelogfacilities, $package['logging']['facilityname']);
 					if (!is_file($g['varlog_path'].'/'.$package['logging']['logfilename'])) {
 						mwexec("{$log_create_directive} {$log_size} {$g['varlog_path']}/{$package['logging']['logfilename']}");
@@ -894,31 +892,41 @@ function system_syslogd_start() {
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= "*.*								{$log_directive}{$g['varlog_path']}/routing.log\n";
 		}
+		if (isset($syslogcfg['routing'])) {
+			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
+		}
 
 		$syslogconf .= "!ntp,ntpd,ntpdate\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= "*.*								{$log_directive}{$g['varlog_path']}/ntpd.log\n";
 		}
+		if (isset($syslogcfg['ntpd'])) {
+			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
+		}
 
 		$syslogconf .= "!ppp\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= "*.*								{$log_directive}{$g['varlog_path']}/ppp.log\n";
 		}
-
-		$syslogconf .= "!pptps\n";
-		if (!isset($syslogcfg['disablelocallogging'])) {
-			$syslogconf .= "*.*								{$log_directive}{$g['varlog_path']}/pptps.log\n";
+		if (isset($syslogcfg['ppp'])) {
+			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
 		}
 
 		$syslogconf .= "!poes\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= "*.*								{$log_directive}{$g['varlog_path']}/poes.log\n";
 		}
+		if (isset($syslogcfg['vpn'])) {
+			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
+		}
 
 		$syslogconf .= "!l2tps\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= "*.*								{$log_directive}{$g['varlog_path']}/l2tps.log\n";
 		}
+		if (isset($syslogcfg['vpn'])) {
+			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
+		}
 
 		$syslogconf .= "!charon,ipsec_starter\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
@@ -948,6 +956,9 @@ function system_syslogd_start() {
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= "*.*								{$log_directive}{$g['varlog_path']}/resolver.log\n";
 		}
+		if (isset($syslogcfg['resolver'])) {
+			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
+		}
 
 		$syslogconf .= "!dhcpd,dhcrelay,dhclient,dhcp6c,dhcpleases,dhcpleases6\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
@@ -977,7 +988,6 @@ function system_syslogd_start() {
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= "*.* 								{$log_directive}{$g['varlog_path']}/filter.log\n";
 		}
-
 		if (isset($syslogcfg['filter'])) {
 			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
 		}
@@ -1053,6 +1063,22 @@ EOD;
 		$syslogd_extra = "-f {$g['varetc_path']}/syslog.conf {$sourceip}";
 	}
 
+	$log_sockets = array("{$g['dhcpd_chroot_path']}/var/run/log");
+
+	if (isset($config['installedpackages']['package'])) {
+		foreach ($config['installedpackages']['package'] as $package) {
+			if (isset($package['logging']['logsocket']) && $package['logging']['logsocket'] != '' &&
+			    is_dir(dirname($package['logging']['logsocket'])) &&
+			    !in_array($package['logging']['logsocket'], $log_sockets)) {
+				$log_sockets[] = $package['logging']['logsocket'];
+			}
+		}
+	}
+	$syslogd_sockets = "";
+	foreach ($log_sockets as $log_socket) {
+		$syslogd_sockets .= " -l {$log_socket}";
+	}
+
 	if (isvalidpid("{$g['varrun_path']}/syslog.pid")) {
 		sigkillbypid("{$g['varrun_path']}/syslog.pid", "TERM");
 		usleep(100000); // syslogd often doesn't respond to a TERM quickly enough for the starting of syslogd below to be successful
@@ -1064,8 +1090,7 @@ EOD;
 		usleep(100000);
 	}
 
-
-	$retval = mwexec_bg("/usr/sbin/syslogd -s -c -c -l {$g['dhcpd_chroot_path']}/var/run/log -P {$g['varrun_path']}/syslog.pid {$syslogd_extra}");
+	$retval = mwexec_bg("/usr/sbin/syslogd -s -c -c {$syslogd_sockets} -P {$g['varrun_path']}/syslog.pid {$syslogd_extra}");
 
 	if (platform_booting()) {
 		echo gettext("done.") . "\n";
diff --git a/src/etc/inc/unbound.inc b/src/etc/inc/unbound.inc
index f7198f8..02b2901 100644
--- a/src/etc/inc/unbound.inc
+++ b/src/etc/inc/unbound.inc
@@ -4,7 +4,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2015 Warren Baker <warren@percol8.co.za>
- * Copyright (c) 2015-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2015-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index aea055c..06734ff 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -3,7 +3,7 @@
  * upgrade_config.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index b46af03..1497491 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -3,7 +3,7 @@
  * util.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/voucher.inc b/src/etc/inc/voucher.inc
index 1ed3845..4ceec0a 100644
--- a/src/etc/inc/voucher.inc
+++ b/src/etc/inc/voucher.inc
@@ -3,7 +3,7 @@
  * voucher.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2007-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2007-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2007 Marcel Wiget <mwiget@mac.com>
  * All rights reserved.
  *
@@ -30,22 +30,9 @@ if (!function_exists('captiveportal_syslog')) {
 }
 
 function xmlrpc_sync_voucher_expire($vouchers, $syncip, $port, $password, $username) {
-	global $g, $config, $cpzone;
-	require_once("XML/RPC2/Client.php");
-
-	$protocol = "http";
-	if (is_array($config['system']) &&
-	    is_array($config['system']['webgui']) &&
-	    !empty($config['system']['webgui']['protocol']) &&
-	    $config['system']['webgui']['protocol'] == "https") {
-		$protocol = "https";
-	}
-	if ($protocol == "https" || $port == "443") {
-		$url = "https://{$syncip}:{$port}";
-	} else {
-		$url = "http://{$syncip}:{$port}";
-	}
-
+	global $cpzone;
+	require_once("xmlrpc_client.inc");
+	
 	/* Construct code that is run on remote machine */
 	$execcmd = <<<EOF
 	global \$cpzone;
@@ -55,67 +42,20 @@ function xmlrpc_sync_voucher_expire($vouchers, $syncip, $port, $password, $usern
 	voucher_expire("$vouchers");
 
 EOF;
-
-	$options = array(
-		'prefix' => 'pfsense.',
-		'sslverify' => false,
-		'connectionTimeout' => 240
-	);
-
-	log_error(sprintf(gettext("Captive Portal Voucher XMLRPC sync data %s."), $url));
-	$cli = XML_RPC2_Client::create($url, $options);
-	if (!is_object($cli)) {
-		$error = sprintf(gettext("A communications error occurred while attempting CaptivePortalVoucherSync XMLRPC sync with %s (pfsense.exec_php)."), $url);
-		log_error($error);
-		file_notice("sync_settings", $error, "Settings Sync", "");
-		return false;
-	}
-
-	try {
-		$resp = $cli->exec_php($username, $password, $execcmd);
-	} catch (XML_RPC2_FaultException $e) {
-		// The XMLRPC server returns a XMLRPC error
-		$error = 'Exception calling XMLRPC method exec_php #' . $e->getFaultCode() . ' : ' . $e->getFaultString();
-		log_error($error);
-		file_notice("CaptivePortalVoucherSync", $error, "Communications error occurred", "");
-		return false;
-	} catch (Exception $e) {
-		// Other errors (HTTP or networking problems...)
-		$error = 'Exception calling XMLRPC method exec_php #' . $e->getMessage();
-		log_error($error);
-		file_notice("CaptivePortalVoucherSync", $error, gettext("Error code received"), "");
-		return false;
-	}
-
-	if (!is_array($resp) && trim($resp) == "Authentication failed") {
-		$error = "An authentication failure occurred while trying to access {$url} (exec_php).";
-		log_error($error);
-		file_notice("sync_settings", $error, "Settings Sync", "");
+	$rpc_client = new pfsense_xmlrpc_client();
+	$rpc_client->setConnectionData($syncip, $port, $username, $password);
+	$resp = $rpc_client->xmlrpc_exec_php($execcmd);
+	if (empty($resp)) {
 		return false;
 	}
-
-	log_error(sprintf(gettext("CaptivePortalVoucherSync XMLRPC reload data success with %s (pfsense.exec_php)."), $url));
-
 	return $resp;
 }
 
 function xmlrpc_sync_voucher_disconnect($dbent, $syncip, $port, $password, $username, $term_cause = 1, $stop_time = null) {
-	global $g, $config, $cpzone;
-	require_once("XML/RPC2/Client.php");
-
-	$protocol = "http";
-	if (is_array($config['system']) && is_array($config['system']['webgui']) && !empty($config['system']['webgui']['protocol']) &&
-	    $config['system']['webgui']['protocol'] == "https") {
-		$protocol = "https";
-	}
-	if ($protocol == "https" || $port == "443") {
-		$url = "https://{$syncip}:{$port}";
-	} else {
-		$url = "http://{$syncip}:{$port}";
-	}
-
+	global $cpzone;
+	require_once("xmlrpc_client.inc");
 	/* Construct code that is run on remote machine */
-	$dbent_str = serialize($dbent);
+	$dbent_str = addslashes(serialize($dbent));
 	$tmp_stop_time = (isset($stop_time)) ? $stop_time : "null";
 	$execcmd = <<<EOF
 	global \$cpzone;
@@ -127,64 +67,18 @@ function xmlrpc_sync_voucher_disconnect($dbent, $syncip, $port, $password, $user
 	captiveportal_disconnect(\$dbent, \$radiusservers, $term_cause, $tmp_stop_time);
 
 EOF;
-
-	$options = array(
-		'prefix' => 'pfsense.',
-		'sslverify' => false,
-		'connectionTimeout' => 240
-	);
-
-	log_error(sprintf(gettext("Captive Portal Voucher XMLRPC sync data %s."), $url));
-	$cli = XML_RPC2_Client::create($url, $options);
-	if (!is_object($cli)) {
-		$error = sprintf(gettext("A communications error occurred while attempting CaptivePortalVoucherSync XMLRPC sync with %s (pfsense.exec_php)."), $url);
-		log_error($error);
-		file_notice("sync_settings", $error, "Settings Sync", "");
+	$rpc_client = new pfsense_xmlrpc_client();
+	$rpc_client->setConnectionData($syncip, $port, $username, $password);
+	$resp = $rpc_client->xmlrpc_exec_php($execcmd);
+	if (empty($resp)) {
 		return false;
 	}
-
-	try {
-		$resp = $cli->exec_php($username, $password, $execcmd);
-	} catch (XML_RPC2_FaultException $e) {
-		// The XMLRPC server returns a XMLRPC error
-		$error = 'Exception calling XMLRPC method exec_php #' . $e->getFaultCode() . ' : ' . $e->getFaultString();
-		log_error($error);
-		file_notice("CaptivePortalVoucherSync", $error, "Communications error occurred", "");
-		return false;
-	} catch (Exception $e) {
-		// Other errors (HTTP or networking problems...)
-		$error = 'Exception calling XMLRPC method exec_php #' . $e->getMessage();
-		log_error($error);
-		file_notice("CaptivePortalVoucherSync", $error, gettext("Error code received"), "");
-		return false;
-	}
-
-	if (!is_array($resp) && trim($resp) == "Authentication failed") {
-		$error = "An authentication failure occurred while trying to access {$url} (exec_php).";
-		log_error($error);
-		file_notice("sync_settings", $error, "Settings Sync", "");
-		return false;
-	}
-
-	log_error(sprintf(gettext("CaptivePortalVoucherSync XMLRPC reload data success with %s (pfsense.exec_php)."), $url));
-
 	return $resp;
 }
 
 function xmlrpc_sync_used_voucher($voucher_received, $syncip, $port, $password, $username) {
-	global $g, $config, $cpzone;
-	require_once("XML/RPC2/Client.php");
-
-	$protocol = "http";
-	if (is_array($config['system']) && is_array($config['system']['webgui']) && !empty($config['system']['webgui']['protocol']) &&
-	    $config['system']['webgui']['protocol'] == "https") {
-		$protocol = "https";
-	}
-	if ($protocol == "https" || $port == "443") {
-		$url = "https://{$syncip}:{$port}";
-	} else {
-		$url = "http://{$syncip}:{$port}";
-	}
+	global $config, $cpzone;
+	require_once("xmlrpc_client.inc");
 
 	/* Construct code that is run on remote machine */
 	$execcmd = <<<EOF
@@ -198,52 +92,17 @@ function xmlrpc_sync_used_voucher($voucher_received, $syncip, $port, $password,
 	\$toreturn['voucher']['roll'] = \$config['voucher'][\$cpzone]['roll'];
 
 EOF;
-
-	$options = array(
-		'prefix' => 'pfsense.',
-		'sslverify' => false,
-		'connectionTimeout' => 240
-	);
-
-	log_error(sprintf(gettext("Captive Portal Voucher XMLRPC sync data %s."), $url));
-	$cli = XML_RPC2_Client::create($url, $options);
-	if (!is_object($cli)) {
-		$error = sprintf(gettext("A communications error occurred while attempting CaptivePortalVoucherSync XMLRPC sync with %s (pfsense.exec_php)."), $url);
-		log_error($error);
-		file_notice("sync_settings", $error, "Settings Sync", "");
-		return null;
-	}
-
-	try {
-		$resp = $cli->exec_php($username, $password, $execcmd);
-	} catch (XML_RPC2_FaultException $e) {
-		// The XMLRPC server returns a XMLRPC error
-		$error = 'Exception calling XMLRPC method exec_php #' . $e->getFaultCode() . ' : ' . $e->getFaultString();
-		log_error($error);
-		file_notice("CaptivePortalVoucherSync", $error, "Communications error occurred", "");
-		return null;
-	} catch (Exception $e) {
-		// Other errors (HTTP or networking problems...)
-		$error = 'Exception calling XMLRPC method exec_php #' . $e->getMessage();
-		log_error($error);
-		file_notice("CaptivePortalVoucherSync", $error, gettext("Error code received"), "");
-		return null;
-	}
-
-	if (!is_array($resp) && trim($resp) == "Authentication failed") {
-		$error = "An authentication failure occurred while trying to access {$url} (exec_php).";
-		log_error($error);
-		file_notice("sync_settings", $error, "Settings Sync", "");
-		return null;
-	}
-
+	$rpc_client = new pfsense_xmlrpc_client();
+	$rpc_client->setConnectionData($syncip, $port, $username, $password);
+	$resp = $rpc_client->xmlrpc_exec_php($execcmd);
+	
 	if (!is_array($config['voucher'])) {
 		$config['voucher'] = array();
 	}
 
 	if (is_array($resp['voucher']['roll'])) {
 		$config['voucher'][$cpzone]['roll'] = $resp['voucher']['roll'];
-		write_config(sprintf(gettext("Captive Portal Voucher database synchronized with %s"), $url));
+		write_config(sprintf(gettext("Captive Portal Voucher database synchronized with %s:%s"), $syncip, $port));
 		voucher_configure_zone(true);
 		unset($resp['voucher']);
 	} else if (!isset($resp['timeleft'])) {
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index d04d8eb..29655cb 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -3,7 +3,7 @@
  * vpn.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2008 Shrew Soft Inc
  * All rights reserved.
  *
diff --git a/src/etc/inc/vslb.inc b/src/etc/inc/vslb.inc
index 1d6900f..7d59cb1 100644
--- a/src/etc/inc/vslb.inc
+++ b/src/etc/inc/vslb.inc
@@ -4,7 +4,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2005-2008 Bill Marquette
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/inc/wizardapp.inc b/src/etc/inc/wizardapp.inc
index c8b3f5c..88143b5 100644
--- a/src/etc/inc/wizardapp.inc
+++ b/src/etc/inc/wizardapp.inc
@@ -3,7 +3,7 @@
  * wizardapp.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2006 Bill Marquette - bill.marquette@gmail.com.
  * All rights reserved.
  *
diff --git a/src/etc/inc/xmlparse.inc b/src/etc/inc/xmlparse.inc
index 7aec616..4be087a 100644
--- a/src/etc/inc/xmlparse.inc
+++ b/src/etc/inc/xmlparse.inc
@@ -3,7 +3,7 @@
  * xmlparse.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/xmlparse_attr.inc b/src/etc/inc/xmlparse_attr.inc
index 4f2779b..cd859c8 100644
--- a/src/etc/inc/xmlparse_attr.inc
+++ b/src/etc/inc/xmlparse_attr.inc
@@ -3,7 +3,7 @@
  * xmlparse_attr.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2010-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2010-2016 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2010 Erik Fonnesbeck
  * All rights reserved.
  *
diff --git a/src/etc/inc/xmlreader.inc b/src/etc/inc/xmlreader.inc
index ac19a25..f904e97 100644
--- a/src/etc/inc/xmlreader.inc
+++ b/src/etc/inc/xmlreader.inc
@@ -3,7 +3,7 @@
  * xmlreader.inc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/inc/xmlrpc_client.inc b/src/etc/inc/xmlrpc_client.inc
new file mode 100644
index 0000000..45c4910
--- /dev/null
+++ b/src/etc/inc/xmlrpc_client.inc
@@ -0,0 +1,137 @@
+<?php
+/*
+ * xmlrpc_client.php
+ *
+ * part of pfSense (https://www.pfsense.org)
+ * Copyright (c) 2016 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("XML/RPC2/Client.php");
+
+class pfsense_xmlrpc_client {
+	
+	private $username, $password, $url, $filenotice, $error;
+	
+	public function __construct() {
+		global $config;
+		$hasync = $config['hasync'];
+
+		if (empty($hasync['username'])) {
+			$username = "admin";
+		} else {
+			$username = $hasync['username'];
+		}
+		/* if port is empty lets rely on the protocol selection */
+		$port = $config['system']['webgui']['port'];
+		if (empty($port)) {
+			if ($config['system']['webgui']['protocol'] == "http") {
+				$port = "80";
+			} else {
+				$port = "443";
+			}
+		}
+		$this->setConnectionData($hasync['synchronizetoip'], $port, $username, $hasync['password']);
+	}
+	
+	public function setConnectionData($syncip, $port, $username, $password) {
+		global $config;
+		$this->username = $username;
+		$this->password = $password;
+		$this->filenotice = "sync_settings";
+		
+		$protocol = "http";
+		if (is_array($config['system']) && 
+			is_array($config['system']['webgui']) && 
+			!empty($config['system']['webgui']['protocol']) &&
+			$config['system']['webgui']['protocol'] == "https") {
+			$protocol = "https";
+		}
+		if (is_ipaddrv6($syncip)) {
+			$syncip = "[{$syncip}]";
+		}
+		if ($protocol == "https" || $port == "443") {
+			$this->url = "https://{$syncip}:{$port}/xmlrpc.php";
+		} else {
+			$this->url = "http://{$syncip}:{$port}/xmlrpc.php";
+		}
+	}
+	
+	function set_noticefile($noticefile) {
+		$this->filenotice = $noticefile;
+	}
+
+	function xmlrpc_internal($method, $parameter, $timeout = 240) {
+		$this->error = null;
+		$options = array(
+			'prefix' => 'pfsense.',
+			'sslverify' => false,
+			'connectionTimeout' => $timeout
+		);
+		
+		$numberofruns = 0;
+		while ($numberofruns < 2) {
+			$numberofruns++;
+
+			log_error(sprintf(gettext("Beginning XMLRPC sync data to %s."), $this->url));
+			$cli = XML_RPC2_Client::create($this->url, $options);
+			if (!is_object($cli)) {
+				$this->error = sprintf(gettext("A communications error occurred while attempting XMLRPC sync with %s (pfsense.%s)."), $this->url, $method);
+				log_error($this->error);
+				file_notice($this->filenotice, $this->error, "Settings Sync", "");
+				continue;
+			}
+			try {//restore_config_section
+				$resp = $cli->$method($this->username, $this->password, $parameter);
+			} catch (XML_RPC2_FaultException $e) {
+				// The XMLRPC server returns a XMLRPC error
+				$this->error = "Exception calling XMLRPC method {$method} #" . $e->getFaultCode() . ' : ' . $e->getFaultString();
+				log_error($this->error);
+				file_notice($this->filenotice, $this->error, "Communications error occurred", "");
+				continue;
+			} catch (Exception $e) {
+				// Other errors (HTTP or networking problems...)
+				$this->error = "Exception calling XMLRPC method {$method} # " . $e->getMessage();
+				log_error($this->error);
+				file_notice($this->filenotice, $this->error, gettext("Error code received"), "");
+				continue;
+			}
+
+			if (!is_array($resp) && trim($resp) == "Authentication failed") {
+				$this->error = "An authentication failure occurred while trying to access {$this->url} ({$method}).";
+				log_error($this->error);
+				file_notice($this->filenotice, $this->error, "Settings Sync", "");
+				continue;
+			}
+			log_error(sprintf(gettext("XMLRPC reload data success with %s (pfsense.{$method})."), $this->url));
+			return $resp;
+		}
+		return null;
+	}
+	
+	function xmlrpc_exec_php($execcmd, $timeout = 240) {
+		$resp = $this->xmlrpc_internal("exec_php", $execcmd, $timeout);
+		return $resp;
+	}
+	
+	function xmlrpc_method($method, $parameter = "", $timeout = 240) {
+		$resp = $this->xmlrpc_internal($method, $parameter, $timeout);
+		return $resp;
+	}
+	
+	function get_error() {
+		return $this->error;
+	}
+}
\ No newline at end of file
diff --git a/src/etc/pfSense-devd.conf b/src/etc/pfSense-devd.conf
index a24a963..7c575b1 100644
--- a/src/etc/pfSense-devd.conf
+++ b/src/etc/pfSense-devd.conf
@@ -2,7 +2,7 @@
 # pfSense-devd.conf
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/pfSense-rc b/src/etc/pfSense-rc
index c01dc50..ef1f105 100755
--- a/src/etc/pfSense-rc
+++ b/src/etc/pfSense-rc
@@ -3,7 +3,7 @@
 # pfSense-rc
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # originally based on m0n0wall (http://neon1.net/m0n0wall)
@@ -337,7 +337,7 @@ trap "echo 'Reboot interrupted'; exit 1" 3
 
 echo -n "."
 DISABLESYSLOGCLOG=$(/usr/local/sbin/read_xml_tag.sh boolean system/disablesyslogclog)
-LOG_FILES="system filter dhcpd vpn pptps poes l2tps openvpn portalauth ipsec ppp relayd wireless nginx ntpd gateways resolver routing"
+LOG_FILES="system filter dhcpd vpn poes l2tps openvpn portalauth ipsec ppp relayd wireless nginx ntpd gateways resolver routing"
 
 DEFAULT_LOG_FILE_SIZE=$(/usr/local/sbin/read_xml_tag.sh string syslog/logfilesize)
 DEFAULT_LOG_FILE_SIZE=${DEFAULT_LOG_FILE_SIZE:-"511488"}
diff --git a/src/etc/pfSense-rc.shutdown b/src/etc/pfSense-rc.shutdown
index 3c72106..9e01643 100755
--- a/src/etc/pfSense-rc.shutdown
+++ b/src/etc/pfSense-rc.shutdown
@@ -3,7 +3,7 @@
 # pfSense-rc.shutdown
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles
index ff07481..ebee8ea 100644
--- a/src/etc/pfSense.obsoletedfiles
+++ b/src/etc/pfSense.obsoletedfiles
@@ -35,7 +35,6 @@
 /etc/inc/sysctl.inc
 /etc/inc/uuid.php
 /etc/inc/xmlrpc.inc
-/etc/inc/xmlrpc_client.inc
 /etc/inc/xmlrpc_server.inc
 /etc/inc/zeromq.inc
 /etc/inetd.conf
diff --git a/src/etc/phpshellsessions/changepassword b/src/etc/phpshellsessions/changepassword
index f8ed4f0..287444a 100644
--- a/src/etc/phpshellsessions/changepassword
+++ b/src/etc/phpshellsessions/changepassword
@@ -2,7 +2,7 @@
  * changepassword
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/disablecarp b/src/etc/phpshellsessions/disablecarp
index 76991f6..d42181a 100644
--- a/src/etc/phpshellsessions/disablecarp
+++ b/src/etc/phpshellsessions/disablecarp
@@ -2,7 +2,7 @@
  * disablecarp
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/disablecarpmaint b/src/etc/phpshellsessions/disablecarpmaint
index ae01818..b14cfe0 100644
--- a/src/etc/phpshellsessions/disablecarpmaint
+++ b/src/etc/phpshellsessions/disablecarpmaint
@@ -2,7 +2,7 @@
  * disablecarpmaint
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/disabledhcpd b/src/etc/phpshellsessions/disabledhcpd
index 89aadf2..769c58c 100644
--- a/src/etc/phpshellsessions/disabledhcpd
+++ b/src/etc/phpshellsessions/disabledhcpd
@@ -2,7 +2,7 @@
  * disabledhcpd
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/disablereferercheck b/src/etc/phpshellsessions/disablereferercheck
index 8c740cb..0940e10 100644
--- a/src/etc/phpshellsessions/disablereferercheck
+++ b/src/etc/phpshellsessions/disablereferercheck
@@ -2,7 +2,7 @@
  * disablereferercheck
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/enableallowallwan b/src/etc/phpshellsessions/enableallowallwan
index 8965db7..5547ea2 100644
--- a/src/etc/phpshellsessions/enableallowallwan
+++ b/src/etc/phpshellsessions/enableallowallwan
@@ -2,7 +2,7 @@
  * enableallowallwan
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/enablecarp b/src/etc/phpshellsessions/enablecarp
index e98ca23..274bd41 100644
--- a/src/etc/phpshellsessions/enablecarp
+++ b/src/etc/phpshellsessions/enablecarp
@@ -2,7 +2,7 @@
  * enablecarp
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/enablecarpmaint b/src/etc/phpshellsessions/enablecarpmaint
index c0063ca..6f265cb 100644
--- a/src/etc/phpshellsessions/enablecarpmaint
+++ b/src/etc/phpshellsessions/enablecarpmaint
@@ -2,7 +2,7 @@
  * enablecarpmaint
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/enablesshd b/src/etc/phpshellsessions/enablesshd
index 65c12eb..5147eaa 100644
--- a/src/etc/phpshellsessions/enablesshd
+++ b/src/etc/phpshellsessions/enablesshd
@@ -2,7 +2,7 @@
  * enablesshd
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/externalconfiglocator b/src/etc/phpshellsessions/externalconfiglocator
index 8dccaa6..f6b856a 100644
--- a/src/etc/phpshellsessions/externalconfiglocator
+++ b/src/etc/phpshellsessions/externalconfiglocator
@@ -2,7 +2,7 @@
  * externalconfiglocator
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/generateguicert b/src/etc/phpshellsessions/generateguicert
index cc1030e..114c93d 100644
--- a/src/etc/phpshellsessions/generateguicert
+++ b/src/etc/phpshellsessions/generateguicert
@@ -2,7 +2,7 @@
  * generateguicert
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync
index 2a8fdf2..60dfc7b 100644
--- a/src/etc/phpshellsessions/gitsync
+++ b/src/etc/phpshellsessions/gitsync
@@ -3,7 +3,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2010-2012 Erik Fonnesbeck
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/installpkg b/src/etc/phpshellsessions/installpkg
index ceea196..e7fabcf 100644
--- a/src/etc/phpshellsessions/installpkg
+++ b/src/etc/phpshellsessions/installpkg
@@ -2,7 +2,7 @@
  * installpkg
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/listpkg b/src/etc/phpshellsessions/listpkg
index cfea22f..55f2255 100644
--- a/src/etc/phpshellsessions/listpkg
+++ b/src/etc/phpshellsessions/listpkg
@@ -2,7 +2,7 @@
  * listpkg
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/removepkgconfig b/src/etc/phpshellsessions/removepkgconfig
index 12ae4cb..6bda04f 100644
--- a/src/etc/phpshellsessions/removepkgconfig
+++ b/src/etc/phpshellsessions/removepkgconfig
@@ -2,7 +2,7 @@
  * removepkgconfig
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/removeshaper b/src/etc/phpshellsessions/removeshaper
index 365a562..ab35e8e 100644
--- a/src/etc/phpshellsessions/removeshaper
+++ b/src/etc/phpshellsessions/removeshaper
@@ -2,7 +2,7 @@
  * removeshaper
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/resetwebgui b/src/etc/phpshellsessions/resetwebgui
index b29b1a3f..15d8044 100644
--- a/src/etc/phpshellsessions/resetwebgui
+++ b/src/etc/phpshellsessions/resetwebgui
@@ -2,7 +2,7 @@
  * resetwebgui
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/restartdhcpd b/src/etc/phpshellsessions/restartdhcpd
index b1740fa..0202020 100644
--- a/src/etc/phpshellsessions/restartdhcpd
+++ b/src/etc/phpshellsessions/restartdhcpd
@@ -2,7 +2,7 @@
  * restartdhcpd
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/restartipsec b/src/etc/phpshellsessions/restartipsec
index 33cd971..334b95d 100644
--- a/src/etc/phpshellsessions/restartipsec
+++ b/src/etc/phpshellsessions/restartipsec
@@ -2,7 +2,7 @@
  * restartipsec
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/svc b/src/etc/phpshellsessions/svc
index ab757a1..c5df36d 100644
--- a/src/etc/phpshellsessions/svc
+++ b/src/etc/phpshellsessions/svc
@@ -2,7 +2,7 @@
  * svc
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/phpshellsessions/uninstallpkg b/src/etc/phpshellsessions/uninstallpkg
index b484194..f54927a 100644
--- a/src/etc/phpshellsessions/uninstallpkg
+++ b/src/etc/phpshellsessions/uninstallpkg
@@ -2,7 +2,7 @@
  * uninstallpkg
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.banner b/src/etc/rc.banner
index 4b741bc..736b413 100755
--- a/src/etc/rc.banner
+++ b/src/etc/rc.banner
@@ -5,7 +5,7 @@
  *
  * part of pfSense
  * Copyright (c) 2005 Colin Smith
- * Copyright (c) 2005-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2005-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index 438bf68..51b9215 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -6,7 +6,7 @@
  * originally based on m0n0wall (http://m0n0.ch/wall)
  * Copyright (c) 2003-2004 Manuel Kasper <mk@neon1.net>.
  * Copyright (c) 2009 Erik Kristensen
- * Copyright (c) 2005-2016 Electric Sheep Fencing, LLC. All rights reserved.
+ * Copyright (c) 2005-2016 Rubicon Communications, LLC (Netgate). All rights reserved.
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.captiveportal_configure b/src/etc/rc.captiveportal_configure
index 8ca7b2f..ead5f68 100755
--- a/src/etc/rc.captiveportal_configure
+++ b/src/etc/rc.captiveportal_configure
@@ -4,7 +4,7 @@
  * rc.captiveportal_configure
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.captiveportal_configure_mac b/src/etc/rc.captiveportal_configure_mac
index fa7a850..dc155cd 100755
--- a/src/etc/rc.captiveportal_configure_mac
+++ b/src/etc/rc.captiveportal_configure_mac
@@ -4,7 +4,7 @@
  * rc.captiveportal_configure_mac
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2015 Electric Sheep Fencing, LLC
+ * Copyright (c) 2015 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.carpbackup b/src/etc/rc.carpbackup
index b537411..8a0c2b7 100755
--- a/src/etc/rc.carpbackup
+++ b/src/etc/rc.carpbackup
@@ -4,7 +4,7 @@
  * rc.carpbackup
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.carpmaster b/src/etc/rc.carpmaster
index d536948..d960d9c 100755
--- a/src/etc/rc.carpmaster
+++ b/src/etc/rc.carpmaster
@@ -4,7 +4,7 @@
  * rc.carpmaster
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.cdrom b/src/etc/rc.cdrom
index 0296a12..e28b575 100755
--- a/src/etc/rc.cdrom
+++ b/src/etc/rc.cdrom
@@ -3,7 +3,7 @@
 # rc.cdrom
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.conf_mount_ro b/src/etc/rc.conf_mount_ro
index be115da..3ea8fa2 100755
--- a/src/etc/rc.conf_mount_ro
+++ b/src/etc/rc.conf_mount_ro
@@ -4,7 +4,7 @@
  * rc.conf_mount_ro
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.conf_mount_rw b/src/etc/rc.conf_mount_rw
index 2979097..a760ac4 100755
--- a/src/etc/rc.conf_mount_rw
+++ b/src/etc/rc.conf_mount_rw
@@ -4,7 +4,7 @@
  * rc.conf_mount_rw
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.disable_hdd_apm b/src/etc/rc.disable_hdd_apm
index 8744d7b..d373134 100755
--- a/src/etc/rc.disable_hdd_apm
+++ b/src/etc/rc.disable_hdd_apm
@@ -3,7 +3,7 @@
 # rc.disable_hdd_apm
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.dumpon b/src/etc/rc.dumpon
index 977c7fb..e8d3817 100755
--- a/src/etc/rc.dumpon
+++ b/src/etc/rc.dumpon
@@ -3,7 +3,7 @@
 # rc.dumpon
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Based on src/etc/rc.d/dumpon from FreeBSD
diff --git a/src/etc/rc.dyndns.update b/src/etc/rc.dyndns.update
index cf0d1b7..4d959f2 100755
--- a/src/etc/rc.dyndns.update
+++ b/src/etc/rc.dyndns.update
@@ -4,7 +4,7 @@
  * rc.dyndns.update
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.embedded b/src/etc/rc.embedded
index 11f8b3f..69bee65 100755
--- a/src/etc/rc.embedded
+++ b/src/etc/rc.embedded
@@ -3,7 +3,7 @@
 # rc.embedded
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.expireaccounts b/src/etc/rc.expireaccounts
index 6a57ae0..c554d81 100755
--- a/src/etc/rc.expireaccounts
+++ b/src/etc/rc.expireaccounts
@@ -5,7 +5,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2009 Shrew Soft Inc.
- * Copyright (c) 2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.filter_configure b/src/etc/rc.filter_configure
index 0342ecf..1f48b30 100755
--- a/src/etc/rc.filter_configure
+++ b/src/etc/rc.filter_configure
@@ -4,7 +4,7 @@
  * rc.filter_configure
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.filter_configure_sync b/src/etc/rc.filter_configure_sync
index baea05b..6b9621e 100755
--- a/src/etc/rc.filter_configure_sync
+++ b/src/etc/rc.filter_configure_sync
@@ -4,7 +4,7 @@
  * rc.filter_configure_sync
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize
index 88bebab..c363ff2 100755
--- a/src/etc/rc.filter_synchronize
+++ b/src/etc/rc.filter_synchronize
@@ -6,7 +6,7 @@
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2005 Bill Marquette
  * Copyright (c) 2006 Peter Allgeyer
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
@@ -31,8 +31,8 @@ require_once("config.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
-require_once("XML/RPC2/Client.php");
 require_once("interfaces.inc");
+require_once("xmlrpc_client.inc");
 
 /*
  *  backup_vip_config_section($section): returns as an xml file string of
@@ -85,75 +85,35 @@ function remove_special_characters($string) {
 	return $string;
 }
 
-function carp_check_version($url, $username, $password, $method = 'host_firmware_version') {
+function carp_check_version() {
 	global $config, $g;
 
 	if (file_exists("{$g['varrun_path']}/booting") || platform_booting()) {
 		return;
 	}
 
-	$options = array(
-		'prefix' => 'pfsense.',
-		'sslverify' => false,
-		'connectionTimeout' => 240
-	);
+	$rpc_client = new pfsense_xmlrpc_client();
+	$resp = $rpc_client->xmlrpc_method('host_firmware_version');
 
-	$numberofruns = 0;
-	while ($numberofruns < 2) {
-		$numberofruns++;
-
-		$cli = XML_RPC2_Client::create($url, $options);
-		if (!is_object($cli)) {
-			$error = "A communications error occurred while attempting XMLRPC sync with username {$username} {$url}.";
-			log_error($error);
-			file_notice("sync_settings", $error, "Settings Sync", "");
-			continue;
-		}
-
-		try {
-			$resp = $cli->$method($username, $password);
-		} catch (XML_RPC2_FaultException $e) {
-			// The XMLRPC server returns a XMLRPC error
-			$error = 'Exception calling XMLRPC method ' . $method . ' #' . $e->getFaultCode() . ' : ' . $e->getFaultString();
-			log_error($error);
-			file_notice("sync_settings", $error, "Settings Sync", "");
-			continue;
-		} catch (Exception $e) {
-			// Other errors (HTTP or networking problems...)
-			$error = 'Exception calling XMLRPC method ' . $method . ' #' . $e->getMessage();
-			log_error($error);
-			file_notice("sync_settings", $error, "Settings Sync", "");
-			continue;
-		}
-
-		if (!is_array($resp)) {
-			if (trim($resp) == "Authentication failed") {
-				$error = "An authentication failure occurred while trying to access {$url} ({$method}).";
-				log_error($error);
-				file_notice("sync_settings", $error, "Settings Sync", "");
-				return false;
-			}
-		} elseif (!isset($resp['config_version']) ||
-		    ($resp['config_version'] != $config['version'])) {
-			update_filter_reload_status("The other member is on a different configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
-			log_error("The other member is on a different configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
-			return false;
-		} else {
-			return true;
-		}
+	log_error(sprintf(gettext("XMLRPC versioncheck:").$resp['config_version'] ." -- ". $config['version']));
+	if (!isset($resp['config_version']) ||
+		($resp['config_version'] != $config['version'])) {
+		update_filter_reload_status("The other member is on a different configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
+		log_error("The other member is on a different configuration version of {$g['product_name']}. Sync will not be done to prevent problems!");
+		return false;
+	} else {
+		return true;
 	}
 	return false;
 }
 
-function carp_sync_xml($url, $username, $password, $sections, $method = 'restore_config_section') {
+function carp_sync_xml($sections) {
 	global $config, $g;
 
 	if (file_exists("{$g['varrun_path']}/booting") || platform_booting()) {
 		return true;
 	}
 
-	update_filter_reload_status("Syncing CARP data to {$url}");
-
 	/* make a copy of config */
 	$config_copy = $config;
 
@@ -243,58 +203,18 @@ function carp_sync_xml($url, $username, $password, $sections, $method = 'restore
 				break;
 			case 'authserver':
 				$xml['system'][$section] = $config_copy['system'][$section];
+				break;
 			default:
 				$xml[$section] = $config_copy[$section];
 		}
 	}
-
-	$options = array(
-		'prefix' => 'pfsense.',
-		'sslverify' => false,
-		'connectionTimeout' => 240
-	);
-
-	$numberofruns = 0;
-	while ($numberofruns < 2) {
-		$numberofruns++;
-
-		log_error("Beginning XMLRPC sync to {$url}.");
-		$cli = XML_RPC2_Client::create($url, $options);
-		if (!is_object($cli)) {
-			$error = "A communications error occurred while attempting XMLRPC sync with username {$username} {$url}.";
-			log_error($error);
-			file_notice("sync_settings", $error, "Settings Sync", "");
-			continue;
-		}
-
-		try {
-			$resp = $cli->$method($username, $password, $xml);
-		} catch (XML_RPC2_FaultException $e) {
-			// The XMLRPC server returns a XMLRPC error
-			$error = 'Exception calling XMLRPC method ' . $method . '#' . $e->getFaultCode() . ' : ' . $e->getFaultString();
-			log_error($error);
-			file_notice("sync_settings", $error, "Settings Sync", "");
-			continue;
-		} catch (Exception $e) {
-			// Other errors (HTTP or networking problems...)
-			$error = 'Exception calling XMLRPC method ' . $method . ' #' . $e->getMessage();
-			log_error($error);
-			file_notice("sync_settings", $error, "Settings Sync", "");
-			continue;
-		}
-
-		if (!is_array($resp) && trim($resp) == "Authentication failed") {
-			$error = "An authentication failure occurred while trying to access {$url} ($method).";
-			log_error($error);
-			file_notice("sync_settings", $error, "Settings Sync", "");
-			return false;
-		} else {
-			log_error("XMLRPC sync successfully completed with {$url}.");
-			update_filter_reload_status("XMLRPC sync successfully completed with {$url}.");
-			return true;
-		}
+	
+	$rpc_client = new pfsense_xmlrpc_client();
+	$resp = $rpc_client->xmlrpc_method('restore_config_section', $xml);
+	if ($resp != null) {
+		update_filter_reload_status("XMLRPC sync successfully completed with {$syncip}:{$port}.");
+		return true;
 	}
-
 	return false;
 }
 
@@ -311,29 +231,6 @@ if (is_array($config['hasync'])) {
 		return;
 	}
 
-	/*
-	* XXX: The way we're finding the port right now is really suboptimal -
-	*     we can't assume that the other machine is setup identically.
-	*/
-	if (!empty($config['system']['webgui']['protocol'])) {
-		$synchronizetoip = $config['system']['webgui']['protocol'];
-		$synchronizetoip .= "://";
-	}
-
-	/* if port is empty lets rely on the protocol selection */
-	$port = $config['system']['webgui']['port'];
-	if (empty($port)) {
-		if ($config['system']['webgui']['protocol'] == "http") {
-			$port = "80";
-		} else {
-			$port = "443";
-		}
-	}
-
-	if (is_ipaddrv6($hasync['synchronizetoip'])) {
-		$hasync['synchronizetoip'] = "[{$hasync['synchronizetoip']}]";
-	}
-	$synchronizetoip .= $hasync['synchronizetoip'] . ":{$port}/xmlrpc.php";
 	if ($hasync['synchronizerules'] != "") {
 		if (!is_array($config['filter'])) {
 			$config['filter'] = array();
@@ -425,6 +322,9 @@ if (is_array($config['hasync'])) {
 		$sections[] = 'group';
 	}
 	if ($hasync['synchronizeauthservers'] != "") {
+		if (!is_array($config['system']['authserver'])) {
+			$config['system']['authserver'] = array();
+		}
 		$sections[] = 'authserver';
 	}
 	if ($hasync['synchronizednsforwarder'] != "") {
@@ -452,51 +352,17 @@ if (is_array($config['hasync'])) {
 		log_error("Nothing has been configured to be synched. Skipping....");
 		return;
 	}
-
-	if (empty($hasync['username'])) {
-		$username = "admin";
-	} else {
-		$username = $hasync['username'];
-	}
-
-	if (!carp_check_version($synchronizetoip, $username, $hasync['password'])) {
+	
+	if (!carp_check_version()) {
 		return;
 	}
 
 	update_filter_reload_status("Signaling CARP reload signal...");
-	if (!carp_sync_xml($synchronizetoip, $username, $hasync['password'], $sections)) {
+	if (!carp_sync_xml($sections)) {
 		return;
 	}
 
-	$options = array(
-		'prefix' => 'pfsense.',
-		'sslverify' => false,
-		'connectionTimeout' => 900
-	);
-
-	$cli = XML_RPC2_Client::create($synchronizetoip, $options);
-	if (!is_object($cli)) {
-		$error = "A communications error occurred while attempting Filter sync with username {$username} {$synchronizetoip}.";
-		log_error($error);
-		file_notice("sync_settings", $error, "Settings Sync", "");
-	} else {
-		try {
-			$resp = $cli->filter_configure($username, $hasync['password']);
-		} catch (XML_RPC2_FaultException $e) {
-			// The XMLRPC server returns a XMLRPC error
-			$error = 'Exception calling XMLRPC method filter_configure #' . $e->getFaultCode() . ' : ' . $e->getFaultString();
-			log_error($error);
-			file_notice("sync_settings", $error, "Settings Sync", "");
-			return;
-		} catch (Exception $e) {
-			// Other errors (HTTP or networking problems...)
-			$error = 'Exception calling XMLRPC method filter_configure #' . $e->getMessage();
-			log_error($error);
-			file_notice("sync_settings", $error, "Settings Sync", "");
-			return;
-		}
-		log_error("Filter sync successfully completed with {$synchronizetoip}.");
-	}
+	$rpc_client = new pfsense_xmlrpc_client();
+	$resp = $rpc_client->xmlrpc_method('filter_configure', "", 900);
+	
 }
-
-?>
diff --git a/src/etc/rc.gateway_alarm b/src/etc/rc.gateway_alarm
index 8ec4669..2ac516e 100755
--- a/src/etc/rc.gateway_alarm
+++ b/src/etc/rc.gateway_alarm
@@ -2,7 +2,7 @@
 #
 # rc.gateway_alarm
 #
-# Copyright (c) 2015 Electric Sheep Fencing, LLC. All rights reserved.
+# Copyright (c) 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.
diff --git a/src/etc/rc.initial b/src/etc/rc.initial
index 2280310..9d87a44 100755
--- a/src/etc/rc.initial
+++ b/src/etc/rc.initial
@@ -3,7 +3,7 @@
 # rc.initial
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # originally based on m0n0wall (http://neon1.net/m0n0wall)
diff --git a/src/etc/rc.initial.defaults b/src/etc/rc.initial.defaults
index afbf947..20a051a 100755
--- a/src/etc/rc.initial.defaults
+++ b/src/etc/rc.initial.defaults
@@ -4,7 +4,7 @@
  * rc.initial.defaults
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.initial.halt b/src/etc/rc.initial.halt
index 78ff116..1a42a59 100755
--- a/src/etc/rc.initial.halt
+++ b/src/etc/rc.initial.halt
@@ -5,7 +5,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2004 Bachman Kharazmi
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.initial.password b/src/etc/rc.initial.password
index 82dc9b5..661e17c 100755
--- a/src/etc/rc.initial.password
+++ b/src/etc/rc.initial.password
@@ -4,7 +4,7 @@
  * rc.initial.password
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.initial.ping b/src/etc/rc.initial.ping
index 6f563fd..49ebbda 100755
--- a/src/etc/rc.initial.ping
+++ b/src/etc/rc.initial.ping
@@ -4,7 +4,7 @@
  * rc.initial.ping
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.initial.reboot b/src/etc/rc.initial.reboot
index d5bd802..30c1b72 100755
--- a/src/etc/rc.initial.reboot
+++ b/src/etc/rc.initial.reboot
@@ -4,7 +4,7 @@
  * rc.initial.reboot
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.initial.setlanip b/src/etc/rc.initial.setlanip
index abcbc43..3b4f875 100755
--- a/src/etc/rc.initial.setlanip
+++ b/src/etc/rc.initial.setlanip
@@ -4,7 +4,7 @@
  * rc.initial.setlanip
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.initial.setports b/src/etc/rc.initial.setports
index 75b1170..8a91052 100755
--- a/src/etc/rc.initial.setports
+++ b/src/etc/rc.initial.setports
@@ -4,7 +4,7 @@
  * rc.initial.setports
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.initial.store_config_to_removable_device b/src/etc/rc.initial.store_config_to_removable_device
index ab9f343..7f9ec24 100755
--- a/src/etc/rc.initial.store_config_to_removable_device
+++ b/src/etc/rc.initial.store_config_to_removable_device
@@ -4,7 +4,7 @@
  * rc.initial.store_config_to_removable_device
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.initial.toggle_sshd b/src/etc/rc.initial.toggle_sshd
index cdd5425..33524cc 100755
--- a/src/etc/rc.initial.toggle_sshd
+++ b/src/etc/rc.initial.toggle_sshd
@@ -5,7 +5,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2004 Fred Mol <fredmol@xs4all.nl>.
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.interfaces_carp_configure b/src/etc/rc.interfaces_carp_configure
index 4d38d04..b9b3f3e 100755
--- a/src/etc/rc.interfaces_carp_configure
+++ b/src/etc/rc.interfaces_carp_configure
@@ -4,7 +4,7 @@
  * rc.interfaces_carp_configure
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.interfaces_lan_configure b/src/etc/rc.interfaces_lan_configure
index 901648b..32038f5 100755
--- a/src/etc/rc.interfaces_lan_configure
+++ b/src/etc/rc.interfaces_lan_configure
@@ -4,7 +4,7 @@
  * rc.interfaces_lan_configure
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.interfaces_opt_configure b/src/etc/rc.interfaces_opt_configure
index 91176e2..ab40e2b 100755
--- a/src/etc/rc.interfaces_opt_configure
+++ b/src/etc/rc.interfaces_opt_configure
@@ -4,7 +4,7 @@
  * rc.interfaces_opt_configure
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.interfaces_wan_configure b/src/etc/rc.interfaces_wan_configure
index e855eb6..f9c77af 100755
--- a/src/etc/rc.interfaces_wan_configure
+++ b/src/etc/rc.interfaces_wan_configure
@@ -4,7 +4,7 @@
  * rc.interfaces_wan_configure
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.kill_states b/src/etc/rc.kill_states
index e434617..12715ac 100755
--- a/src/etc/rc.kill_states
+++ b/src/etc/rc.kill_states
@@ -4,7 +4,7 @@
  * rc.kill_states
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup
index 2a13ec4..e211edd 100755
--- a/src/etc/rc.linkup
+++ b/src/etc/rc.linkup
@@ -4,7 +4,7 @@
  * rc.linkup
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.nanobsd_switch_boot_slice b/src/etc/rc.nanobsd_switch_boot_slice
index 1567e91..f645474 100755
--- a/src/etc/rc.nanobsd_switch_boot_slice
+++ b/src/etc/rc.nanobsd_switch_boot_slice
@@ -4,7 +4,7 @@
  * rc.nanobsd_switch_boot_slice
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.newipsecdns b/src/etc/rc.newipsecdns
index 11484b6..4670b37 100755
--- a/src/etc/rc.newipsecdns
+++ b/src/etc/rc.newipsecdns
@@ -5,7 +5,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2009 Seth Mos <seth.mos@dds.nl>.
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.newroutedns b/src/etc/rc.newroutedns
index 48477a7..8485368 100755
--- a/src/etc/rc.newroutedns
+++ b/src/etc/rc.newroutedns
@@ -4,7 +4,7 @@
  * rc.newroutedns
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index 66da862..920c1e5 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -4,7 +4,7 @@
  * rc.newwanip
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2006-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index a97f48d..f669f5b 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -4,7 +4,7 @@
  * rc.newwanipv6
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2006-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.notify_message b/src/etc/rc.notify_message
index b6376c2..73dfecd 100755
--- a/src/etc/rc.notify_message
+++ b/src/etc/rc.notify_message
@@ -4,7 +4,7 @@
  * rc.notify_message
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2010-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2010-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.ntpdate b/src/etc/rc.ntpdate
index 8f79980..1f1e9c6 100755
--- a/src/etc/rc.ntpdate
+++ b/src/etc/rc.ntpdate
@@ -4,7 +4,7 @@
  * rc.ntpdate
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.openvpn b/src/etc/rc.openvpn
index 8c0267a..7d1644a 100755
--- a/src/etc/rc.openvpn
+++ b/src/etc/rc.openvpn
@@ -5,7 +5,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2009 Seth Mos <seth.mos@dds.nl>.
- * Copyright (c) 2007-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2007-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.packages b/src/etc/rc.packages
index f2d7acf..b0f37b3 100755
--- a/src/etc/rc.packages
+++ b/src/etc/rc.packages
@@ -4,7 +4,7 @@
  * rc.packages
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.php-fpm_restart b/src/etc/rc.php-fpm_restart
index f77a3fa..0c0b270 100755
--- a/src/etc/rc.php-fpm_restart
+++ b/src/etc/rc.php-fpm_restart
@@ -3,7 +3,7 @@
 # rc.php-fpm-restart
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2014-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2014-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # originally based on m0n0wall (http://neon1.net/m0n0wall)
diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup
index 756b324..3701699 100755
--- a/src/etc/rc.php_ini_setup
+++ b/src/etc/rc.php_ini_setup
@@ -3,7 +3,7 @@
 # rc.php_ini_setup
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2014-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2014-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.prunecaptiveportal b/src/etc/rc.prunecaptiveportal
index b6e67e5..8a5253b 100755
--- a/src/etc/rc.prunecaptiveportal
+++ b/src/etc/rc.prunecaptiveportal
@@ -4,7 +4,7 @@
  * rc.prunecaptiveportal
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.reboot b/src/etc/rc.reboot
index 4d21678..61f9205 100755
--- a/src/etc/rc.reboot
+++ b/src/etc/rc.reboot
@@ -3,7 +3,7 @@
 # rc.reboot
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.reload_all b/src/etc/rc.reload_all
index 127ef85..eea0c40 100755
--- a/src/etc/rc.reload_all
+++ b/src/etc/rc.reload_all
@@ -4,7 +4,7 @@
  * rc.reload_all
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.reload_interfaces b/src/etc/rc.reload_interfaces
index 1711e6f..1ec8211 100755
--- a/src/etc/rc.reload_interfaces
+++ b/src/etc/rc.reload_interfaces
@@ -4,7 +4,7 @@
  * rc.reload_interfaces
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.resolv_conf_generate b/src/etc/rc.resolv_conf_generate
index 99fae5b..a4b12ef 100755
--- a/src/etc/rc.resolv_conf_generate
+++ b/src/etc/rc.resolv_conf_generate
@@ -4,7 +4,7 @@
  * rc.resolv_conf_generate
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2010-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2010-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.restart_webgui b/src/etc/rc.restart_webgui
index b126f85..4e374cc 100755
--- a/src/etc/rc.restart_webgui
+++ b/src/etc/rc.restart_webgui
@@ -4,7 +4,7 @@
  * rc.restart_webgui
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.restore_config_backup b/src/etc/rc.restore_config_backup
index f9ce274..31dbfa3 100755
--- a/src/etc/rc.restore_config_backup
+++ b/src/etc/rc.restore_config_backup
@@ -4,7 +4,7 @@
  * rc.restore_config_backup
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.savecore b/src/etc/rc.savecore
index b3000cb..bb0e1d5 100755
--- a/src/etc/rc.savecore
+++ b/src/etc/rc.savecore
@@ -3,7 +3,7 @@
 # rc.savecore
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Based on src/etc/rc.d/savecore from FreeBSD
diff --git a/src/etc/rc.savevoucher b/src/etc/rc.savevoucher
index 1407f77..1d6bc77 100755
--- a/src/etc/rc.savevoucher
+++ b/src/etc/rc.savevoucher
@@ -4,7 +4,7 @@
  * rc.savevoucher
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2010-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2010-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Originally part of m0n0wall (http://m0n0.ch/wall)
diff --git a/src/etc/rc.start_packages b/src/etc/rc.start_packages
index 3492a35..defe814 100755
--- a/src/etc/rc.start_packages
+++ b/src/etc/rc.start_packages
@@ -4,7 +4,7 @@
  * rc.start_packages
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.stop_packages b/src/etc/rc.stop_packages
index f279ab7..8563105 100755
--- a/src/etc/rc.stop_packages
+++ b/src/etc/rc.stop_packages
@@ -4,7 +4,7 @@
  * rc.stop_packages
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.update_alias_url_data b/src/etc/rc.update_alias_url_data
index f846856..a896584 100755
--- a/src/etc/rc.update_alias_url_data
+++ b/src/etc/rc.update_alias_url_data
@@ -4,7 +4,7 @@
  * rc.update_alias_url_data
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2010-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2010-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/rc.update_bogons.sh b/src/etc/rc.update_bogons.sh
index 466048a..02115e1 100755
--- a/src/etc/rc.update_bogons.sh
+++ b/src/etc/rc.update_bogons.sh
@@ -3,7 +3,7 @@
 # rc.update_bogons.sh
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Based on src/etc/rc.d/savecore from FreeBSD
diff --git a/src/etc/rc.update_urltables b/src/etc/rc.update_urltables
index 026af60..7ef18a7 100755
--- a/src/etc/rc.update_urltables
+++ b/src/etc/rc.update_urltables
@@ -4,7 +4,7 @@
  * rc.update_urltables
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2010-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2010-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/skel/dot.profile b/src/etc/skel/dot.profile
index 7da5c5e..c3788ad 100644
--- a/src/etc/skel/dot.profile
+++ b/src/etc/skel/dot.profile
@@ -2,7 +2,7 @@
 # dot.profile
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/skel/dot.shrc b/src/etc/skel/dot.shrc
index 8777310..3c9dc94 100644
--- a/src/etc/skel/dot.shrc
+++ b/src/etc/skel/dot.shrc
@@ -2,7 +2,7 @@
 # dot.shrc
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/skel/dot.tcshrc b/src/etc/skel/dot.tcshrc
index 4be9072..815c943 100644
--- a/src/etc/skel/dot.tcshrc
+++ b/src/etc/skel/dot.tcshrc
@@ -2,7 +2,7 @@
 # dot.tcshrc
 #
 # part of pfSense (https://www.pfsense.org)
-# Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+# Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/etc/sshd b/src/etc/sshd
index cb84870..d4864e9 100755
--- a/src/etc/sshd
+++ b/src/etc/sshd
@@ -5,7 +5,7 @@
  *
  * part of pfSense (https://www.pfsense.org)
  * Copyright (c) 2004 Fred Mol <fredmol@xs4all.nl>.
- * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
+ * Copyright (c) 2004-2016 Rubicon Communications, LLC (Netgate)
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");