diff --git a/config/rootfiles/core/88/exclude b/config/rootfiles/core/92/exclude
similarity index 100%
rename from config/rootfiles/core/88/exclude
rename to config/rootfiles/core/92/exclude
diff --git a/config/rootfiles/core/92/filelists/files b/config/rootfiles/core/92/filelists/files
new file mode 100644
index 000000000..fe764dbb8
--- /dev/null
+++ b/config/rootfiles/core/92/filelists/files
@@ -0,0 +1,9 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/cgi-bin/webaccess.cgi
+var/ipfire/network-functions.pl
+var/ipfire/langs
+var/ipfire/urlfilter/bin/autoupdate.pl
diff --git a/config/rootfiles/core/88/meta b/config/rootfiles/core/92/meta
similarity index 100%
rename from config/rootfiles/core/88/meta
rename to config/rootfiles/core/92/meta
diff --git a/config/rootfiles/core/92/update.sh b/config/rootfiles/core/92/update.sh
new file mode 100644
index 000000000..0314d80c4
--- /dev/null
+++ b/config/rootfiles/core/92/update.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2015 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=92
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/ipsec stop
+
+# Extract files
+extract_files
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Regenerate IPsec configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+
+sync
+
+# Start services
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+	/etc/init.d/ipsec start
+fi
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/core/89/exclude b/config/rootfiles/oldcore/88/exclude
similarity index 100%
rename from config/rootfiles/core/89/exclude
rename to config/rootfiles/oldcore/88/exclude
diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/oldcore/88/filelists/files
similarity index 100%
rename from config/rootfiles/core/88/filelists/files
rename to config/rootfiles/oldcore/88/filelists/files
diff --git a/config/rootfiles/core/88/filelists/fireinfo b/config/rootfiles/oldcore/88/filelists/fireinfo
similarity index 100%
rename from config/rootfiles/core/88/filelists/fireinfo
rename to config/rootfiles/oldcore/88/filelists/fireinfo
diff --git a/config/rootfiles/core/88/filelists/openssh b/config/rootfiles/oldcore/88/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/88/filelists/openssh
rename to config/rootfiles/oldcore/88/filelists/openssh
diff --git a/config/rootfiles/core/88/filelists/openssl b/config/rootfiles/oldcore/88/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/88/filelists/openssl
rename to config/rootfiles/oldcore/88/filelists/openssl
diff --git a/config/rootfiles/core/88/filelists/openssl-compat b/config/rootfiles/oldcore/88/filelists/openssl-compat
similarity index 100%
rename from config/rootfiles/core/88/filelists/openssl-compat
rename to config/rootfiles/oldcore/88/filelists/openssl-compat
diff --git a/config/rootfiles/core/89/meta b/config/rootfiles/oldcore/88/meta
similarity index 100%
rename from config/rootfiles/core/89/meta
rename to config/rootfiles/oldcore/88/meta
diff --git a/config/rootfiles/core/88/update.sh b/config/rootfiles/oldcore/88/update.sh
similarity index 100%
rename from config/rootfiles/core/88/update.sh
rename to config/rootfiles/oldcore/88/update.sh
diff --git a/config/rootfiles/core/91/exclude b/config/rootfiles/oldcore/89/exclude
similarity index 100%
rename from config/rootfiles/core/91/exclude
rename to config/rootfiles/oldcore/89/exclude
diff --git a/config/rootfiles/core/89/filelists/collectd b/config/rootfiles/oldcore/89/filelists/collectd
similarity index 100%
rename from config/rootfiles/core/89/filelists/collectd
rename to config/rootfiles/oldcore/89/filelists/collectd
diff --git a/config/rootfiles/core/89/filelists/daq b/config/rootfiles/oldcore/89/filelists/daq
similarity index 100%
rename from config/rootfiles/core/89/filelists/daq
rename to config/rootfiles/oldcore/89/filelists/daq
diff --git a/config/rootfiles/core/89/filelists/ddns b/config/rootfiles/oldcore/89/filelists/ddns
similarity index 100%
rename from config/rootfiles/core/89/filelists/ddns
rename to config/rootfiles/oldcore/89/filelists/ddns
diff --git a/config/rootfiles/core/89/filelists/dnsmasq b/config/rootfiles/oldcore/89/filelists/dnsmasq
similarity index 100%
rename from config/rootfiles/core/89/filelists/dnsmasq
rename to config/rootfiles/oldcore/89/filelists/dnsmasq
diff --git a/config/rootfiles/core/89/filelists/ethtool b/config/rootfiles/oldcore/89/filelists/ethtool
similarity index 100%
rename from config/rootfiles/core/89/filelists/ethtool
rename to config/rootfiles/oldcore/89/filelists/ethtool
diff --git a/config/rootfiles/core/89/filelists/fcron b/config/rootfiles/oldcore/89/filelists/fcron
similarity index 100%
rename from config/rootfiles/core/89/filelists/fcron
rename to config/rootfiles/oldcore/89/filelists/fcron
diff --git a/config/rootfiles/core/89/filelists/file b/config/rootfiles/oldcore/89/filelists/file
similarity index 100%
rename from config/rootfiles/core/89/filelists/file
rename to config/rootfiles/oldcore/89/filelists/file
diff --git a/config/rootfiles/core/89/filelists/files b/config/rootfiles/oldcore/89/filelists/files
similarity index 100%
rename from config/rootfiles/core/89/filelists/files
rename to config/rootfiles/oldcore/89/filelists/files
diff --git a/config/rootfiles/core/89/filelists/fuse b/config/rootfiles/oldcore/89/filelists/fuse
similarity index 100%
rename from config/rootfiles/core/89/filelists/fuse
rename to config/rootfiles/oldcore/89/filelists/fuse
diff --git a/config/rootfiles/core/89/filelists/gnupg b/config/rootfiles/oldcore/89/filelists/gnupg
similarity index 100%
rename from config/rootfiles/core/89/filelists/gnupg
rename to config/rootfiles/oldcore/89/filelists/gnupg
diff --git a/config/rootfiles/core/89/filelists/grep b/config/rootfiles/oldcore/89/filelists/grep
similarity index 100%
rename from config/rootfiles/core/89/filelists/grep
rename to config/rootfiles/oldcore/89/filelists/grep
diff --git a/config/rootfiles/core/89/filelists/hdparm b/config/rootfiles/oldcore/89/filelists/hdparm
similarity index 100%
rename from config/rootfiles/core/89/filelists/hdparm
rename to config/rootfiles/oldcore/89/filelists/hdparm
diff --git a/config/rootfiles/core/89/filelists/libart b/config/rootfiles/oldcore/89/filelists/libart
similarity index 100%
rename from config/rootfiles/core/89/filelists/libart
rename to config/rootfiles/oldcore/89/filelists/libart
diff --git a/config/rootfiles/core/89/filelists/libcap b/config/rootfiles/oldcore/89/filelists/libcap
similarity index 100%
rename from config/rootfiles/core/89/filelists/libcap
rename to config/rootfiles/oldcore/89/filelists/libcap
diff --git a/config/rootfiles/core/89/filelists/libffi b/config/rootfiles/oldcore/89/filelists/libffi
similarity index 100%
rename from config/rootfiles/core/89/filelists/libffi
rename to config/rootfiles/oldcore/89/filelists/libffi
diff --git a/config/rootfiles/core/89/filelists/libpcap b/config/rootfiles/oldcore/89/filelists/libpcap
similarity index 100%
rename from config/rootfiles/core/89/filelists/libpcap
rename to config/rootfiles/oldcore/89/filelists/libpcap
diff --git a/config/rootfiles/core/89/filelists/ntfs-3g b/config/rootfiles/oldcore/89/filelists/ntfs-3g
similarity index 100%
rename from config/rootfiles/core/89/filelists/ntfs-3g
rename to config/rootfiles/oldcore/89/filelists/ntfs-3g
diff --git a/config/rootfiles/core/89/filelists/openssh b/config/rootfiles/oldcore/89/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/89/filelists/openssh
rename to config/rootfiles/oldcore/89/filelists/openssh
diff --git a/config/rootfiles/core/89/filelists/openssl b/config/rootfiles/oldcore/89/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/89/filelists/openssl
rename to config/rootfiles/oldcore/89/filelists/openssl
diff --git a/config/rootfiles/core/89/filelists/openssl-compat b/config/rootfiles/oldcore/89/filelists/openssl-compat
similarity index 100%
rename from config/rootfiles/core/89/filelists/openssl-compat
rename to config/rootfiles/oldcore/89/filelists/openssl-compat
diff --git a/config/rootfiles/core/89/filelists/pcre b/config/rootfiles/oldcore/89/filelists/pcre
similarity index 100%
rename from config/rootfiles/core/89/filelists/pcre
rename to config/rootfiles/oldcore/89/filelists/pcre
diff --git a/config/rootfiles/core/89/filelists/screen b/config/rootfiles/oldcore/89/filelists/screen
similarity index 100%
rename from config/rootfiles/core/89/filelists/screen
rename to config/rootfiles/oldcore/89/filelists/screen
diff --git a/config/rootfiles/core/89/filelists/setup b/config/rootfiles/oldcore/89/filelists/setup
similarity index 100%
rename from config/rootfiles/core/89/filelists/setup
rename to config/rootfiles/oldcore/89/filelists/setup
diff --git a/config/rootfiles/core/89/filelists/smartmontools b/config/rootfiles/oldcore/89/filelists/smartmontools
similarity index 100%
rename from config/rootfiles/core/89/filelists/smartmontools
rename to config/rootfiles/oldcore/89/filelists/smartmontools
diff --git a/config/rootfiles/core/89/filelists/snort b/config/rootfiles/oldcore/89/filelists/snort
similarity index 100%
rename from config/rootfiles/core/89/filelists/snort
rename to config/rootfiles/oldcore/89/filelists/snort
diff --git a/config/rootfiles/core/89/filelists/sqlite b/config/rootfiles/oldcore/89/filelists/sqlite
similarity index 100%
rename from config/rootfiles/core/89/filelists/sqlite
rename to config/rootfiles/oldcore/89/filelists/sqlite
diff --git a/config/rootfiles/core/89/filelists/squid b/config/rootfiles/oldcore/89/filelists/squid
similarity index 100%
rename from config/rootfiles/core/89/filelists/squid
rename to config/rootfiles/oldcore/89/filelists/squid
diff --git a/config/rootfiles/core/89/filelists/strongswan b/config/rootfiles/oldcore/89/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/89/filelists/strongswan
rename to config/rootfiles/oldcore/89/filelists/strongswan
diff --git a/config/rootfiles/core/89/filelists/tar b/config/rootfiles/oldcore/89/filelists/tar
similarity index 100%
rename from config/rootfiles/core/89/filelists/tar
rename to config/rootfiles/oldcore/89/filelists/tar
diff --git a/config/rootfiles/core/89/filelists/tzdata b/config/rootfiles/oldcore/89/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/89/filelists/tzdata
rename to config/rootfiles/oldcore/89/filelists/tzdata
diff --git a/config/rootfiles/core/89/filelists/wget b/config/rootfiles/oldcore/89/filelists/wget
similarity index 100%
rename from config/rootfiles/core/89/filelists/wget
rename to config/rootfiles/oldcore/89/filelists/wget
diff --git a/config/rootfiles/core/89/filelists/zlib b/config/rootfiles/oldcore/89/filelists/zlib
similarity index 100%
rename from config/rootfiles/core/89/filelists/zlib
rename to config/rootfiles/oldcore/89/filelists/zlib
diff --git a/config/rootfiles/core/90/meta b/config/rootfiles/oldcore/89/meta
similarity index 100%
rename from config/rootfiles/core/90/meta
rename to config/rootfiles/oldcore/89/meta
diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/oldcore/89/update.sh
similarity index 100%
rename from config/rootfiles/core/89/update.sh
rename to config/rootfiles/oldcore/89/update.sh
diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/oldcore/90/exclude
similarity index 100%
rename from config/rootfiles/core/90/exclude
rename to config/rootfiles/oldcore/90/exclude
diff --git a/config/rootfiles/core/90/filelists/Locale-Country b/config/rootfiles/oldcore/90/filelists/Locale-Country
similarity index 100%
rename from config/rootfiles/core/90/filelists/Locale-Country
rename to config/rootfiles/oldcore/90/filelists/Locale-Country
diff --git a/config/rootfiles/core/90/filelists/apache2 b/config/rootfiles/oldcore/90/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/90/filelists/apache2
rename to config/rootfiles/oldcore/90/filelists/apache2
diff --git a/config/rootfiles/core/90/filelists/armv5tel/glibc b/config/rootfiles/oldcore/90/filelists/armv5tel/glibc
similarity index 100%
rename from config/rootfiles/core/90/filelists/armv5tel/glibc
rename to config/rootfiles/oldcore/90/filelists/armv5tel/glibc
diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-kirkwood
similarity index 100%
rename from config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood
rename to config/rootfiles/oldcore/90/filelists/armv5tel/linux-kirkwood
diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-multi
similarity index 100%
rename from config/rootfiles/core/90/filelists/armv5tel/linux-multi
rename to config/rootfiles/oldcore/90/filelists/armv5tel/linux-multi
diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-rpi
similarity index 100%
rename from config/rootfiles/core/90/filelists/armv5tel/linux-rpi
rename to config/rootfiles/oldcore/90/filelists/armv5tel/linux-rpi
diff --git a/config/rootfiles/core/90/filelists/curl b/config/rootfiles/oldcore/90/filelists/curl
similarity index 100%
rename from config/rootfiles/core/90/filelists/curl
rename to config/rootfiles/oldcore/90/filelists/curl
diff --git a/config/rootfiles/core/90/filelists/cyrus-sasl b/config/rootfiles/oldcore/90/filelists/cyrus-sasl
similarity index 100%
rename from config/rootfiles/core/90/filelists/cyrus-sasl
rename to config/rootfiles/oldcore/90/filelists/cyrus-sasl
diff --git a/config/rootfiles/core/90/filelists/ddns b/config/rootfiles/oldcore/90/filelists/ddns
similarity index 100%
rename from config/rootfiles/core/90/filelists/ddns
rename to config/rootfiles/oldcore/90/filelists/ddns
diff --git a/config/rootfiles/core/90/filelists/dhcp b/config/rootfiles/oldcore/90/filelists/dhcp
similarity index 100%
rename from config/rootfiles/core/90/filelists/dhcp
rename to config/rootfiles/oldcore/90/filelists/dhcp
diff --git a/config/rootfiles/core/90/filelists/dhcpcd b/config/rootfiles/oldcore/90/filelists/dhcpcd
similarity index 100%
rename from config/rootfiles/core/90/filelists/dhcpcd
rename to config/rootfiles/oldcore/90/filelists/dhcpcd
diff --git a/config/rootfiles/core/90/filelists/dnsmasq b/config/rootfiles/oldcore/90/filelists/dnsmasq
similarity index 100%
rename from config/rootfiles/core/90/filelists/dnsmasq
rename to config/rootfiles/oldcore/90/filelists/dnsmasq
diff --git a/config/rootfiles/core/90/filelists/dracut b/config/rootfiles/oldcore/90/filelists/dracut
similarity index 100%
rename from config/rootfiles/core/90/filelists/dracut
rename to config/rootfiles/oldcore/90/filelists/dracut
diff --git a/config/rootfiles/core/90/filelists/expat b/config/rootfiles/oldcore/90/filelists/expat
similarity index 100%
rename from config/rootfiles/core/90/filelists/expat
rename to config/rootfiles/oldcore/90/filelists/expat
diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/oldcore/90/filelists/files
similarity index 100%
rename from config/rootfiles/core/90/filelists/files
rename to config/rootfiles/oldcore/90/filelists/files
diff --git a/config/rootfiles/core/90/filelists/fireinfo b/config/rootfiles/oldcore/90/filelists/fireinfo
similarity index 100%
rename from config/rootfiles/core/90/filelists/fireinfo
rename to config/rootfiles/oldcore/90/filelists/fireinfo
diff --git a/config/rootfiles/core/90/filelists/flag-icons b/config/rootfiles/oldcore/90/filelists/flag-icons
similarity index 100%
rename from config/rootfiles/core/90/filelists/flag-icons
rename to config/rootfiles/oldcore/90/filelists/flag-icons
diff --git a/config/rootfiles/core/90/filelists/groff b/config/rootfiles/oldcore/90/filelists/groff
similarity index 100%
rename from config/rootfiles/core/90/filelists/groff
rename to config/rootfiles/oldcore/90/filelists/groff
diff --git a/config/rootfiles/core/90/filelists/i586/acpid b/config/rootfiles/oldcore/90/filelists/i586/acpid
similarity index 100%
rename from config/rootfiles/core/90/filelists/i586/acpid
rename to config/rootfiles/oldcore/90/filelists/i586/acpid
diff --git a/config/rootfiles/core/90/filelists/i586/glibc b/config/rootfiles/oldcore/90/filelists/i586/glibc
similarity index 100%
rename from config/rootfiles/core/90/filelists/i586/glibc
rename to config/rootfiles/oldcore/90/filelists/i586/glibc
diff --git a/config/rootfiles/core/90/filelists/i586/linux b/config/rootfiles/oldcore/90/filelists/i586/linux
similarity index 100%
rename from config/rootfiles/core/90/filelists/i586/linux
rename to config/rootfiles/oldcore/90/filelists/i586/linux
diff --git a/config/rootfiles/core/90/filelists/i586/linux-initrd b/config/rootfiles/oldcore/90/filelists/i586/linux-initrd
similarity index 100%
rename from config/rootfiles/core/90/filelists/i586/linux-initrd
rename to config/rootfiles/oldcore/90/filelists/i586/linux-initrd
diff --git a/config/rootfiles/core/90/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/90/filelists/i586/openssl-sse2
similarity index 100%
rename from config/rootfiles/core/90/filelists/i586/openssl-sse2
rename to config/rootfiles/oldcore/90/filelists/i586/openssl-sse2
diff --git a/config/rootfiles/core/90/filelists/iptables b/config/rootfiles/oldcore/90/filelists/iptables
similarity index 100%
rename from config/rootfiles/core/90/filelists/iptables
rename to config/rootfiles/oldcore/90/filelists/iptables
diff --git a/config/rootfiles/core/90/filelists/iputils b/config/rootfiles/oldcore/90/filelists/iputils
similarity index 100%
rename from config/rootfiles/core/90/filelists/iputils
rename to config/rootfiles/oldcore/90/filelists/iputils
diff --git a/config/rootfiles/core/90/filelists/libjpeg b/config/rootfiles/oldcore/90/filelists/libjpeg
similarity index 100%
rename from config/rootfiles/core/90/filelists/libjpeg
rename to config/rootfiles/oldcore/90/filelists/libjpeg
diff --git a/config/rootfiles/core/90/filelists/logrotate b/config/rootfiles/oldcore/90/filelists/logrotate
similarity index 100%
rename from config/rootfiles/core/90/filelists/logrotate
rename to config/rootfiles/oldcore/90/filelists/logrotate
diff --git a/config/rootfiles/core/90/filelists/logwatch b/config/rootfiles/oldcore/90/filelists/logwatch
similarity index 100%
rename from config/rootfiles/core/90/filelists/logwatch
rename to config/rootfiles/oldcore/90/filelists/logwatch
diff --git a/config/rootfiles/core/90/filelists/openldap b/config/rootfiles/oldcore/90/filelists/openldap
similarity index 100%
rename from config/rootfiles/core/90/filelists/openldap
rename to config/rootfiles/oldcore/90/filelists/openldap
diff --git a/config/rootfiles/core/90/filelists/openssl b/config/rootfiles/oldcore/90/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/90/filelists/openssl
rename to config/rootfiles/oldcore/90/filelists/openssl
diff --git a/config/rootfiles/core/90/filelists/openssl-0.9.8-files b/config/rootfiles/oldcore/90/filelists/openssl-0.9.8-files
similarity index 100%
rename from config/rootfiles/core/90/filelists/openssl-0.9.8-files
rename to config/rootfiles/oldcore/90/filelists/openssl-0.9.8-files
diff --git a/config/rootfiles/core/90/filelists/perl-Text-CSV_XS b/config/rootfiles/oldcore/90/filelists/perl-Text-CSV_XS
similarity index 100%
rename from config/rootfiles/core/90/filelists/perl-Text-CSV_XS
rename to config/rootfiles/oldcore/90/filelists/perl-Text-CSV_XS
diff --git a/config/rootfiles/core/90/filelists/squid b/config/rootfiles/oldcore/90/filelists/squid
similarity index 100%
rename from config/rootfiles/core/90/filelists/squid
rename to config/rootfiles/oldcore/90/filelists/squid
diff --git a/config/rootfiles/core/90/filelists/strongswan b/config/rootfiles/oldcore/90/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/90/filelists/strongswan
rename to config/rootfiles/oldcore/90/filelists/strongswan
diff --git a/config/rootfiles/core/90/filelists/tzdata b/config/rootfiles/oldcore/90/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/90/filelists/tzdata
rename to config/rootfiles/oldcore/90/filelists/tzdata
diff --git a/config/rootfiles/core/90/filelists/udev b/config/rootfiles/oldcore/90/filelists/udev
similarity index 100%
rename from config/rootfiles/core/90/filelists/udev
rename to config/rootfiles/oldcore/90/filelists/udev
diff --git a/config/rootfiles/core/90/filelists/wpa_supplicant b/config/rootfiles/oldcore/90/filelists/wpa_supplicant
similarity index 100%
rename from config/rootfiles/core/90/filelists/wpa_supplicant
rename to config/rootfiles/oldcore/90/filelists/wpa_supplicant
diff --git a/config/rootfiles/core/90/filelists/xtables-addons b/config/rootfiles/oldcore/90/filelists/xtables-addons
similarity index 100%
rename from config/rootfiles/core/90/filelists/xtables-addons
rename to config/rootfiles/oldcore/90/filelists/xtables-addons
diff --git a/config/rootfiles/core/90/filelists/xz b/config/rootfiles/oldcore/90/filelists/xz
similarity index 100%
rename from config/rootfiles/core/90/filelists/xz
rename to config/rootfiles/oldcore/90/filelists/xz
diff --git a/config/rootfiles/core/91/meta b/config/rootfiles/oldcore/90/meta
similarity index 100%
rename from config/rootfiles/core/91/meta
rename to config/rootfiles/oldcore/90/meta
diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/oldcore/90/update.sh
similarity index 100%
rename from config/rootfiles/core/90/update.sh
rename to config/rootfiles/oldcore/90/update.sh
diff --git a/config/rootfiles/oldcore/91/exclude b/config/rootfiles/oldcore/91/exclude
new file mode 100644
index 000000000..18e9b4d24
--- /dev/null
+++ b/config/rootfiles/oldcore/91/exclude
@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/oldcore/91/filelists/files
similarity index 100%
rename from config/rootfiles/core/91/filelists/files
rename to config/rootfiles/oldcore/91/filelists/files
diff --git a/config/rootfiles/core/91/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/91/filelists/i586/openssl-sse2
similarity index 100%
rename from config/rootfiles/core/91/filelists/i586/openssl-sse2
rename to config/rootfiles/oldcore/91/filelists/i586/openssl-sse2
diff --git a/config/rootfiles/core/91/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/91/filelists/i586/strongswan-padlock
similarity index 100%
rename from config/rootfiles/core/91/filelists/i586/strongswan-padlock
rename to config/rootfiles/oldcore/91/filelists/i586/strongswan-padlock
diff --git a/config/rootfiles/core/91/filelists/libnet b/config/rootfiles/oldcore/91/filelists/libnet
similarity index 100%
rename from config/rootfiles/core/91/filelists/libnet
rename to config/rootfiles/oldcore/91/filelists/libnet
diff --git a/config/rootfiles/core/91/filelists/libtool b/config/rootfiles/oldcore/91/filelists/libtool
similarity index 100%
rename from config/rootfiles/core/91/filelists/libtool
rename to config/rootfiles/oldcore/91/filelists/libtool
diff --git a/config/rootfiles/core/91/filelists/libxml2 b/config/rootfiles/oldcore/91/filelists/libxml2
similarity index 100%
rename from config/rootfiles/core/91/filelists/libxml2
rename to config/rootfiles/oldcore/91/filelists/libxml2
diff --git a/config/rootfiles/core/91/filelists/libxslt b/config/rootfiles/oldcore/91/filelists/libxslt
similarity index 100%
rename from config/rootfiles/core/91/filelists/libxslt
rename to config/rootfiles/oldcore/91/filelists/libxslt
diff --git a/config/rootfiles/core/91/filelists/newt b/config/rootfiles/oldcore/91/filelists/newt
similarity index 100%
rename from config/rootfiles/core/91/filelists/newt
rename to config/rootfiles/oldcore/91/filelists/newt
diff --git a/config/rootfiles/core/91/filelists/openssh b/config/rootfiles/oldcore/91/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/91/filelists/openssh
rename to config/rootfiles/oldcore/91/filelists/openssh
diff --git a/config/rootfiles/core/91/filelists/openssl b/config/rootfiles/oldcore/91/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/91/filelists/openssl
rename to config/rootfiles/oldcore/91/filelists/openssl
diff --git a/config/rootfiles/core/91/filelists/pcre b/config/rootfiles/oldcore/91/filelists/pcre
similarity index 100%
rename from config/rootfiles/core/91/filelists/pcre
rename to config/rootfiles/oldcore/91/filelists/pcre
diff --git a/config/rootfiles/core/91/filelists/slang b/config/rootfiles/oldcore/91/filelists/slang
similarity index 100%
rename from config/rootfiles/core/91/filelists/slang
rename to config/rootfiles/oldcore/91/filelists/slang
diff --git a/config/rootfiles/core/91/filelists/strongswan b/config/rootfiles/oldcore/91/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/91/filelists/strongswan
rename to config/rootfiles/oldcore/91/filelists/strongswan
diff --git a/config/rootfiles/oldcore/91/meta b/config/rootfiles/oldcore/91/meta
new file mode 100644
index 000000000..d547fa86f
--- /dev/null
+++ b/config/rootfiles/oldcore/91/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/oldcore/91/update.sh
similarity index 100%
rename from config/rootfiles/core/91/update.sh
rename to config/rootfiles/oldcore/91/update.sh
diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index dd48d58cb..971c51e6c 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -244,7 +244,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) {
 	} # enabled
     }#loop interface verify
 
-    map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2');	# Must not be saved 
+    map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2','q');	# Must not be saved
     &General::writehash($setting, \%dhcpsettings);		# Save good settings
     $dhcpsettings{'ACTION'} = $Lang::tr{'save'};		# create an 'ACTION'
     map ($dhcpsettings{$_} = '',@nosaved,'KEY1','KEY2');	# and reinit vars to empty
@@ -267,7 +267,7 @@ if ($ENV{'QUERY_STRING'} =~ /^FETHER|^FIPADDR/ ) {
 	$newsort.=$Rev;
     }
     $dhcpsettings{'SORT_FLEASELIST'}=$newsort;
-    map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2');	# Must never be saved 
+    map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2', 'q');	# Must never be saved
     &General::writehash($setting, \%dhcpsettings);
     &sortcurrent2;
     $dhcpsettings{'ACTION'} = 'SORT';			# create an 'ACTION'
@@ -942,7 +942,10 @@ foreach my $line (@current2) {
 
     # Skip all entries that do not match the search query
     if ($search_query ne "") {
-	next if (!grep(/$search_query/, @temp));
+	if (!grep(/$search_query/, @temp)) {
+		$key++;
+		next;
+	}
     }
 
     if ($dhcpsettings{'KEY2'} eq $key) {
diff --git a/make.sh b/make.sh
index 3bf532b4c..db16c55dc 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.17"							# Version number
-CORE="91"							# Core Level (Filename)
+CORE="92"							# Core Level (Filename)
 PAKFIRE_CORE="91"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan