diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index dcf77cb01..c1d62a5c2 100644
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -30,8 +30,6 @@ usr/lib/collectd/email.so
 usr/lib/collectd/entropy.so
 #usr/lib/collectd/exec.la
 usr/lib/collectd/exec.so
-usr/lib/collectd/filecount.la
-usr/lib/collectd/filecount.so
 #usr/lib/collectd/hddtemp.la
 usr/lib/collectd/hddtemp.so
 #usr/lib/collectd/interface.la
@@ -74,8 +72,6 @@ usr/lib/collectd/tail.so
 usr/lib/collectd/tcpconns.so
 #usr/lib/collectd/teamspeak2.la
 usr/lib/collectd/teamspeak2.so
-usr/lib/collectd/thermal.la
-usr/lib/collectd/thermal.so
 usr/lib/collectd/types.db
 #usr/lib/collectd/unixsock.la
 usr/lib/collectd/unixsock.so
@@ -94,8 +90,6 @@ usr/lib/collectd/wireless.so
 #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd/.packlist
 usr/sbin/collectd
 usr/sbin/collectdmon
-usr/share/collectd
-usr/share/collectd/postgresql_default.conf
 #usr/share/man/man1/collectd-nagios.1
 #usr/share/man/man1/collectd.1
 #usr/share/man/man1/collectdmon.1
diff --git a/config/rootfiles/core/17/files b/config/rootfiles/core/17/files
index 7b5ab402b..51d7280f5 100644
--- a/config/rootfiles/core/17/files
+++ b/config/rootfiles/core/17/files
@@ -20,5 +20,3 @@ usr/lib/collectd/
 var/lib/collectd/
 usr/sbin/collectd
 usr/sbin/collectdmon
-usr/share/collectd
-usr/share/collectd/postgresql_default.conf
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f1ba32422..867456a39 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -134,7 +134,6 @@
 * inetutils-1.4.2
 * ipaddr-1.2
 * ipfireseeder-1.00
-* ipp2p-0.8.2
 * iproute2-2.6.16-060323
 * iptables-1.4.1.1
 * iptstate-2.1
@@ -225,7 +224,6 @@
 * openssl-0.9.8g
 * openswan-2.4.12
 * openswan-2.4.12-kmod
-* openswan-2.6.16
 * openvpn-2.0.9
 * pam_mysql-0.7RC1
 * patch-2.5.4