diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 2e248e011..97955d2e4 100644
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -35,7 +35,7 @@ usr/lib/collectd/hddtemp.so
 #usr/lib/collectd/interface.la
 usr/lib/collectd/interface.so
 #usr/lib/collectd/iptables.la
-usr/lib/collectd/iptables.so
+#usr/lib/collectd/iptables.so #### temporary disabled ####
 #usr/lib/collectd/irq.la
 usr/lib/collectd/irq.so
 #usr/lib/collectd/load.la
diff --git a/config/rootfiles/common/ipp2p b/config/rootfiles/common/ipp2p
index 742f9eae8..39f2bce06 100644
--- a/config/rootfiles/common/ipp2p
+++ b/config/rootfiles/common/ipp2p
@@ -1,3 +1,3 @@
 #lib/modules/2.6.16/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
-lib/iptables/libipt_ipp2p.so
+#lib/iptables/libipt_ipp2p.so
 #lib/modules/2.6.16-smp/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
diff --git a/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch b/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
old mode 100755
new mode 100644