Merge branch 'master' of https://github.com/pfsense/pfsense-packages into hap_de-install_logging

Conflicts:
	config/haproxy-devel/haproxy.inc

16 files changed, 149 insertions, 149 deletions

diff --git a/config/archive/assp.xml b/config/archive/assp.xml
index 94f35b2e..626b2438 100644
--- a/config/archive/assp.xml
+++ b/config/archive/assp.xml
@@ -61,7 +61,7 @@
                 <executable>perl</executable>
         </service>
     	<additional_files_needed>
-		<item>http://www.pfsense.com/packages/All/assp-1.0.tgz</item>
+		<item>https://www.pfsense.org/packages/All/assp-1.0.tgz</item>
 	</additional_files_needed>
 	<custom_php_install_command>
 	    $start = "/usr/bin/perl /usr/local/assp/assp.pl &amp;\necho $! > /var/run/assp.pid";
diff --git a/config/archive/clamsmtp.xml b/config/archive/clamsmtp.xml
index 16bb5d6d..4f2bf443 100644
--- a/config/archive/clamsmtp.xml
+++ b/config/archive/clamsmtp.xml
@@ -56,12 +56,12 @@
 		<description>SMTP virus scanner.</description>
 	</service>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/clamsmtp.inc</item>
+		<item>https://packages.pfsense.org/packages/config/clamsmtp.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/bin/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/All/clamsmtpd</item>
+		<item>https://www.pfsense.org/packages/All/clamsmtpd</item>
 	</additional_files_needed>
 	<custom_php_install_command>
 		clamsmtp_install_command();
diff --git a/config/archive/doorman.xml b/config/archive/doorman.xml
index 64f35087..c2a5f18e 100644
--- a/config/archive/doorman.xml
+++ b/config/archive/doorman.xml
@@ -74,7 +74,7 @@
         </tabs>
 	<configpath>installedpackages->package->$packagename->configuration->settings</configpath>
 	<additional_files_needed>
-		<item>http://www.pfsense.com/packages/config/doormanusers.xml</item>
+		<item>https://packages.pfsense.org/packages/config/doormanusers.xml</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/archive/dspam/conf.default/config.xml b/config/archive/dspam/conf.default/config.xml
index 4b33662e..9aabd08e 100644
--- a/config/archive/dspam/conf.default/config.xml
+++ b/config/archive/dspam/conf.default/config.xml
@@ -849,9 +849,9 @@
       <version>0.1</version>
       <status>ALPHA</status>
       <maintainer>fernando@netfilter.com.br</maintainer>
-      <depends_on_package_base_url>http://www.pfsense.com/packages/All/</depends_on_package_base_url>
+      <depends_on_package_base_url>https://www.pfsense.org/packages/All/</depends_on_package_base_url>
       <depends_on_package>p3scan-pf-2.3.2.tbz</depends_on_package>
-      <config_file>http://www.pfsense.org/packages/config/p3scan-pf/p3scan-pf.xml</config_file>
+      <config_file>https://packages.pfsense.org/packages/config/p3scan-pf/p3scan-pf.xml</config_file>
       <configurationfile>p3scan-pf.xml</configurationfile>
     </package>
 		<package>
@@ -898,9 +898,9 @@
       <version>0.1</version>
       <status>ALPHA</status>
       <maintainer>me@daniel.stefan.haischt.name</maintainer>
-      <depends_on_package_base_url>http://www.pfsense.com/packages/All/</depends_on_package_base_url>
+      <depends_on_package_base_url>https://www.pfsense.org/packages/All/</depends_on_package_base_url>
       <depends_on_package>sshtools-0.2.2.tbz</depends_on_package>
-      <config_file>http://www.pfsense.org/packages/config/sshterm/sshterm.xml</config_file>
+      <config_file>https://packages.pfsense.org/packages/config/sshterm/sshterm.xml</config_file>
       <configurationfile>sshterm.xml</configurationfile>
     </package>
 		<menu>
diff --git a/config/archive/dspam/pkg/dspam-config.inc b/config/archive/dspam/pkg/dspam-config.inc
index 211bee51..bffae808 100644
--- a/config/archive/dspam/pkg/dspam-config.inc
+++ b/config/archive/dspam/pkg/dspam-config.inc
@@ -27,14 +27,14 @@ $CONFIG = array('DSPAM_HOME'          => '/var/db/dspam',
                 'AUTODETECT'          => 1,
                 'OPENSOURCE'          => 0,
                 /* Is there a website which provides dedicated infos? */
-                'PACKAGE_WEBSITE'     => 'http://www.pfsense.com/',
+                'PACKAGE_WEBSITE'     => 'https://www.pfsense.org/',
                 /* Is there a forum which provides dedicated infos? */
-                'PACKAGE_FORUM'       => 'http://www.pfsense.com/',
+                'PACKAGE_FORUM'       => 'https://www.pfsense.org/',
                 /*
                  * Is there a issue tracker which allows to fill a
                  * support request or a bug report?
                  */
-                'PACKAGE_TRACKER'     => 'http://www.pfsense.com/',
+                'PACKAGE_TRACKER'     => 'https://www.pfsense.org/',
                 /* 'DATE_FORMAT'        => '%d.%m.%Y %H:%M' */
                 'DATE_FORMAT'         => '%b %d %H:%M'
                );
diff --git a/config/archive/dspam/pkg/dspam.xml b/config/archive/dspam/pkg/dspam.xml
index 59740ae1..54373ffa 100644
--- a/config/archive/dspam/pkg/dspam.xml
+++ b/config/archive/dspam/pkg/dspam.xml
@@ -104,32 +104,32 @@
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-perf.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-perf.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-admin.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-admin.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-admin-graph.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-admin-graph.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-admin-prefs.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-admin-prefs.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-admin-stats.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-admin-stats.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
@@ -199,32 +199,32 @@
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-prefs.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-prefs.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-quarantine.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-quarantine.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-analysis.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-analysis.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-analysis-graph.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-analysis-graph.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-hfragment.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-hfragment.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/dspam-history.php</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/dspam-history.php</item>
 	</additional_files_needed>
 	<!-- package files -->
 	<additional_files_needed>
@@ -235,93 +235,93 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/dspam.inc</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/dspam.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/dspam-config.inc</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/dspam-config.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/dspam-guifunc.inc</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/dspam-guifunc.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/dspam-pkgfunc.inc</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/dspam-pkgfunc.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/dspam-utilfunc.inc</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/dspam-utilfunc.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/000.mysql.sh</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/000.mysql.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/010.clamav-clamd.sh</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/010.clamav-clamd.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/020.clamav-freshclam.sh</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/020.clamav-freshclam.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/030.p3scan.sh</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/030.p3scan.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/clamd.conf</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/clamd.conf</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/default.prefs.sample</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/default.prefs.sample</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/freshclam.conf</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/freshclam.conf</item>
 	</additional_files_needed>
 	<!-- misc files -->
 	<additional_files_needed>
 		<prefix>/usr/local/www/wizards/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/wizards/dspam_wizard.xml</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/wizards/dspam_wizard.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/wizards/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/wizards/dspam-lda-proxy.png</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/wizards/dspam-lda-proxy.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/wizards/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/wizards/dspam-pop-proxy.png</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/wizards/dspam-pop-proxy.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/wizards/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/wizards/dspam-smtp-relay.png</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/wizards/dspam-smtp-relay.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/pkg/verdana.ttf</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/pkg/verdana.ttf</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/themes/metallic/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dspam/www/themes/metallic/dspam.css</item>
+		<item>https://packages.pfsense.org/packages/config/dspam/www/themes/metallic/dspam.css</item>
 	</additional_files_needed>
 	<!--
     fields gets invoked when the user adds or edits a item. The following items
diff --git a/config/archive/dspam/pkg/p3scan-pf.xml b/config/archive/dspam/pkg/p3scan-pf.xml
index f78c3912..b26dc32c 100644
--- a/config/archive/dspam/pkg/p3scan-pf.xml
+++ b/config/archive/dspam/pkg/p3scan-pf.xml
@@ -97,32 +97,32 @@
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf-msg.xml</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf-msg.xml</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf-emer.xml</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf-emer.xml</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf-vir.xml</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf-vir.xml</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf-spam.xml</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf-spam.xml</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan_rules.php</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan_rules.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan.inc</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan.inc</item>
   </additional_files_needed>
   <!--
     fields gets invoked when the user adds or edits a item. The following items
diff --git a/config/archive/dspam/www/wizards/dspam_wizard.xml b/config/archive/dspam/www/wizards/dspam_wizard.xml
index 4ac96a4c..6590f149 100644
--- a/config/archive/dspam/www/wizards/dspam_wizard.xml
+++ b/config/archive/dspam/www/wizards/dspam_wizard.xml
@@ -15,7 +15,7 @@
 <![CDATA[
 /*
   dspam_wizard.xml
-        part of pfSense (http://www.pfsense.org/)
+        part of pfSense (https://www.pfsense.org/)
 
   Copyright (C) 2006 Daniel S. Haischt
         All rights reserved.
diff --git a/config/archive/freenas/pkg/freenas.xml b/config/archive/freenas/pkg/freenas.xml
index edac8085..f5b875ef 100644
--- a/config/archive/freenas/pkg/freenas.xml
+++ b/config/archive/freenas/pkg/freenas.xml
@@ -126,430 +126,430 @@
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_manage.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_manage.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_manage_edit.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_manage_edit.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_manage_init.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_manage_init.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_manage_iscsi.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_manage_iscsi.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_manage_tools.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_manage_tools.php</item>
   </additional_files_needed>
   <!-- PHP files  (RAID management) -->
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gmirror.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gmirror.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gmirror_edit.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gmirror_edit.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gmirror_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gmirror_infos.php</item>
   </additional_files_needed>
   <!--
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gmirror_init.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gmirror_init.php</item>
   </additional_files_needed>
   -->
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gmirror_tools.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gmirror_tools.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gvinum.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gvinum.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gvinum_edit.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gvinum_edit.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gvinum_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gvinum_infos.php</item>
   </additional_files_needed>
   <!--
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gvinum_init.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gvinum_init.php</item>
   </additional_files_needed>
   -->
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gvinum_tools.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gvinum_tools.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gconcat.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gconcat.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gconcat_edit.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gconcat_edit.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gconcat_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gconcat_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gconcat_tools.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gconcat_tools.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gstripe.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gstripe.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gstripe_edit.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gstripe_edit.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gstripe_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gstripe_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_gstripe_tools.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_gstripe_tools.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_graid5.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_graid5.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_graid5_edit.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_graid5_edit.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_graid5_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_graid5_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_raid_graid5_tools.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_raid_graid5_tools.php</item>
   </additional_files_needed>
   <!-- PHP files  (mount management) -->
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_mount.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_mount.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_mount_edit.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_mount_edit.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/disks_mount_tools.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/disks_mount_tools.php</item>
   </additional_files_needed>
   <!-- PHP files  (diagnostics) -->
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_ad_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_ad_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_ataidle_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_ataidle_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_disk_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_disk_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_iscsi_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_iscsi_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_mounts_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_mounts_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_part_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_part_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_raid_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_raid_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_smart_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_smart_infos.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_space_infos.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_space_infos.php</item>
   </additional_files_needed>
   <!-- PHP files  (logs) -->
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_fn_logs_daemon.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_fn_logs_daemon.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_fn_logs_ftp.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_fn_logs_ftp.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_fn_logs_rsyncd.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_fn_logs_rsyncd.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_fn_logs_samba.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_fn_logs_samba.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_fn_logs_settings.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_fn_logs_settings.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_fn_logs_smartd.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_fn_logs_smartd.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/diag_fn_logs_sshd.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/diag_fn_logs_sshd.php</item>
   </additional_files_needed>
   <!-- PHP files  (services) -->
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_afp.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_afp.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_ftp.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_ftp.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_nfs.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_nfs.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_nfs_export.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_nfs_export.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_nfs_export_edit.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_nfs_export_edit.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_rsyncd.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_rsyncd.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_rsyncd_client.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_rsyncd_client.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_rsyncd_local.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_rsyncd_local.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_samba.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_samba.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_samba_share.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_samba_share.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_samba_edit.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_samba_edit.php</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/services_unison.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/services_unison.php</item>
   </additional_files_needed>
   <!-- PHP files  (misc) -->
   <additional_files_needed>
     <prefix>/usr/local/www/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/www/status_disks.php</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/www/status_disks.php</item>
   </additional_files_needed>
   <!-- package files -->
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas.inc</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/pkg/freenas.inc</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas_disks.inc</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/pkg/freenas_disks.inc</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas_config.inc</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/pkg/freenas_config.inc</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas_functions.inc</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/pkg/freenas_functions.inc</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas_guiconfig.inc</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/pkg/freenas_guiconfig.inc</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas_services.inc</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/pkg/freenas_services.inc</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas_utils.inc</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/pkg/freenas_utils.inc</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas_system.inc</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/pkg/freenas_system.inc</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/rc.freenas</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/pkg/rc.freenas</item>
   </additional_files_needed>
   <!-- kernel binaries -->
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/iscsi_initiator.ko</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/iscsi_initiator.ko</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/ext2fs.ko</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/ext2fs.ko</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/geom_concat.ko</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/geom_concat.ko</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/geom_gpt.ko</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/geom_gpt.ko</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/geom_mirror.ko</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/geom_mirror.ko</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/geom_stripe.ko</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/geom_stripe.ko</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/geom_vinum.ko</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/geom_vinum.ko</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/kernel.gz</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/kernel.gz</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/ntfs.ko</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/ntfs.ko</item>
   </additional_files_needed>
   <!-- misc binaries -->
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/iscontrol</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/iscontrol</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/mountd</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/mountd</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/nfsd</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/nfsd</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/rpcbind</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/rpcbind</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/rpc.lockd</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/rpc.lockd</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/bin/rpc.statd</item>
+    <item>https://packages.pfsense.org/packages/config/freenas/bin/rpc.statd</item>
   </additional_files_needed>
   <!--
     fields gets invoked when the user adds or edits a item. The following items
diff --git a/config/archive/frickin/frickin.xml b/config/archive/frickin/frickin.xml
index 79f8ca5b..51e4c0b6 100644
--- a/config/archive/frickin/frickin.xml
+++ b/config/archive/frickin/frickin.xml
@@ -59,12 +59,12 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/frickin/frickin.inc</item>
+		<item>https://packages.pfsense.org/packages/config/frickin/frickin.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/frickin/bin/frickin2</item>
+		<item>https://packages.pfsense.org/packages/config/frickin/bin/frickin2</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/archive/p3scan-pf/p3scan-pf.xml b/config/archive/p3scan-pf/p3scan-pf.xml
index f309cb50..d4bea8ec 100644
--- a/config/archive/p3scan-pf/p3scan-pf.xml
+++ b/config/archive/p3scan-pf/p3scan-pf.xml
@@ -104,32 +104,32 @@
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf/p3scan-pf-msg.xml</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf/p3scan-pf-msg.xml</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf/p3scan-pf-transex.xml</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf/p3scan-pf-transex.xml</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf/p3scan-pf-emer.xml</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf/p3scan-pf-emer.xml</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf/p3scan-pf-vir.xml</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf/p3scan-pf-vir.xml</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf/p3scan-pf-spam.xml</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf/p3scan-pf-spam.xml</item>
   </additional_files_needed>
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/p3scan-pf/p3scan-pf.inc</item>
+    <item>https://packages.pfsense.org/packages/config/p3scan-pf/p3scan-pf.inc</item>
   </additional_files_needed>
   <!--
     fields gets invoked when the user adds or edits a item. The following items
diff --git a/config/archive/p3scan.xml b/config/archive/p3scan.xml
index 9bc438ff..86376536 100644
--- a/config/archive/p3scan.xml
+++ b/config/archive/p3scan.xml
@@ -56,16 +56,16 @@
 		<description>POP3 virus/spam scanner.</description>
 	</service>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/p3scan.inc</item>
+		<item>https://packages.pfsense.org/packages/config/p3scan.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/bin/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/All/p3scan</item>
+		<item>https://www.pfsense.org/packages/All/p3scan</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/etc/</prefix>
-		<item>http://www.pfsense.org/packages/config/p3scan.mail</item>
+		<item>https://packages.pfsense.org/packages/config/p3scan.mail</item>
 	</additional_files_needed>
 	<custom_php_install_command>
 		p3scan_install_command();
diff --git a/config/archive/portsentry/portsentry.xml b/config/archive/portsentry/portsentry.xml
index 3220c8ff..175417b5 100644
--- a/config/archive/portsentry/portsentry.xml
+++ b/config/archive/portsentry/portsentry.xml
@@ -58,7 +58,7 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/portsentry/portsentry.inc</item>
+		<item>https://packages.pfsense.org/packages/config/portsentry/portsentry.inc</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/archive/quagga/quagga.xml b/config/archive/quagga/quagga.xml
index 4f4b65dc..732bd1c1 100644
--- a/config/archive/quagga/quagga.xml
+++ b/config/archive/quagga/quagga.xml
@@ -57,7 +57,7 @@
 	<additional_files_needed>
 	    <prefix>/usr/local/etc/rc.d/</prefix>
 	    <chmod>0777</chmod>
-		<item>http://www.pfsense.org/packages/config/quagga/quagga.sh</item>
+		<item>https://packages.pfsense.org/packages/config/quagga/quagga.sh</item>
 	</additional_files_needed>
 	<custom_php_install_command>
 		mwexec("/usr/local/etc/rc.d/quagga.sh start");
diff --git a/config/archive/sassassin.xml b/config/archive/sassassin.xml
index eb82fd55..61cc0653 100644
--- a/config/archive/sassassin.xml
+++ b/config/archive/sassassin.xml
@@ -77,13 +77,13 @@
 		</tab>
 	</tabs>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/sassassin_wl.xml</item>
+		<item>https://packages.pfsense.org/packages/config/sassassin_wl.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/sassassin_bl.xml</item>
+		<item>https://packages.pfsense.org/packages/config/sassassin_bl.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/sassassin.inc</item>
+		<item>https://packages.pfsense.org/packages/config/sassassin.inc</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/archive/viralator.xml b/config/archive/viralator.xml
index 7573af94..3953b126 100644
--- a/config/archive/viralator.xml
+++ b/config/archive/viralator.xml
@@ -50,10 +50,10 @@
     <title>none</title>
 	<include_file>viralator.inc</include_file>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/viralator.inc</item>
+		<item>https://packages.pfsense.org/packages/config/viralator.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/All/viralator.tgz</item>
+		<item>https://www.pfsense.org/packages/All/viralator.tgz</item>
 	</additional_files_needed>
 	<custom_php_install_command>
 		viralator_install_command();