diff --git a/config/rootfiles/core/18/files b/config/rootfiles/core/18/files
new file mode 100644
index 000000000..42a72d2a2
--- /dev/null
+++ b/config/rootfiles/core/18/files
@@ -0,0 +1,17 @@
+usr/lib/python2.4/htmlentitydefs.pyc
+usr/lib/python2.4/markupbase.pyc
+etc/ssh/moduli
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/rc.d/init.d/sshd
+usr/bin/scp
+usr/bin/sftp
+usr/bin/slogin
+usr/bin/ssh
+usr/bin/ssh-add
+usr/bin/ssh-agent
+usr/bin/ssh-keygen
+usr/bin/ssh-keyscan
+usr/lib/openssh/sftp-server
+usr/lib/openssh/ssh-keysign
+usr/sbin/sshd
diff --git a/config/rootfiles/core/18/meta b/config/rootfiles/core/18/meta
new file mode 100644
index 000000000..d547fa86f
--- /dev/null
+++ b/config/rootfiles/core/18/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/18/update.sh b/config/rootfiles/core/18/update.sh
new file mode 100644
index 000000000..e91c6c181
--- /dev/null
+++ b/config/rootfiles/core/18/update.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+extract_files
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+rm -f /etc/ssh/ssh_host_rsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N ''
+rm -f /etc/ssh/ssh_host_key* && ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1
+rm -f /etc/ssh/ssh_host_dsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa
diff --git a/config/rootfiles/core/24/files b/config/rootfiles/core/24/files
new file mode 100644
index 000000000..b2a3b13e5
--- /dev/null
+++ b/config/rootfiles/core/24/files
@@ -0,0 +1 @@
+srv/web/ipfire/cgi-bin/proxy.cgi
diff --git a/config/rootfiles/core/24/meta b/config/rootfiles/core/24/meta
new file mode 100644
index 000000000..d547fa86f
--- /dev/null
+++ b/config/rootfiles/core/24/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/24/update.sh b/config/rootfiles/core/24/update.sh
new file mode 100644
index 000000000..8a87d9ca5
--- /dev/null
+++ b/config/rootfiles/core/24/update.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+extract_files
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
diff --git a/config/rootfiles/updater/filelists/core18 b/config/rootfiles/updater/filelists/core18
deleted file mode 100644
index 995640ef7..000000000
--- a/config/rootfiles/updater/filelists/core18
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python2.4/htmlentitydefs.pyc
-usr/lib/python2.4/markupbase.pyc
diff --git a/config/rootfiles/updater/filelists/core18 b/config/rootfiles/updater/filelists/core18
new file mode 120000
index 000000000..81a794094
--- /dev/null
+++ b/config/rootfiles/updater/filelists/core18
@@ -0,0 +1 @@
+../../core/18/files
\ No newline at end of file